联合丽格1.0.1

src/main/java/com/caimei/modules/order/entity/NewOrder.java

@@ -33,7 +33,7 @@ public class NewOrder implements Serializable {
 
     private Integer organizeId;
 
-    @ApiModelProperty("订单类型")
+    @ApiModelProperty("订单类型  0协销订单、 1普通订单、 2呵呵订单")
     private Integer orderType;
 
     @ApiModelProperty("订单提交类型")
@@ -153,9 +153,6 @@ public class NewOrder implements Serializable {
     @ApiModelProperty("退货退款类型：0无退款、1部分退、2全部退")
     private String refundType;
 
-    private String orderType;//    订单类型 0协销订单、 1普通订单、 2呵呵订单
-
-
     @ApiModelProperty("邮费订单标识 1是邮费订单  0不是邮费订单")
     private String postageOrderFlag = "0";
 
@@ -272,7 +269,6 @@ public class NewOrder implements Serializable {
     private String startRefundTime;
     private String endRefundTime;
     private String shopNameInfo;//
-    private String spName;
     private Integer serviceProviderId;  //协销Id
     private Double settleAmount;   // 已结算金额
     private Integer splitCount;  //分账记录数

src/main/resources/mapper/CmOperationUserMapper.xml

@@ -376,7 +376,7 @@
     </update>
     <update id="updateUserSpId">
         update user
-        set spId = #{serviceProviderId}
+        set serviceProviderID = #{serviceProviderId}
         where userId = #{userId}
     </update>
     <update id="updateClub">