1

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/constants/BillConstants.java

@@ -29,6 +29,9 @@ public class BillConstants {
     public static final String BILL_TYPE_YUE_PAY = "yue_pay";
     /** 帐单类型-商户分账 */
     public static final String BILL_TYPE_MERCHANT_COLLECT = "merchant_collect";
+
+    /** 帐单类型-商户分账 */
+    public static final String BILL_TYPE_RIDER_COLLECT = "rider_collect";
     /** 帐单类型-佣金 */
     public static final String BILL_TYPE_BROKERAGE = "brokerage";
     /** 帐单类型-系统 */

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/model/order/MerchantOrder.java

@@ -65,7 +65,8 @@ public class MerchantOrder implements Serializable {
 
     @ApiModelProperty(value = "订单总价")
     private BigDecimal totalPrice;
-
+    @ApiModelProperty(value = "首单立减")
+    private BigDecimal firstDeducPrice;
     @ApiModelProperty(value = "实际支付金额")
     private BigDecimal payPrice;
 

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/model/order/Order.java

@@ -145,6 +145,8 @@ public class Order implements Serializable {
 
     @ApiModelProperty(value = "svip优惠金额")
     private BigDecimal svipDiscountPrice;
+    @ApiModelProperty(value = "首单立减")
+    private BigDecimal firstDeducPrice;
 
     @ApiModelProperty(value = "是否svip订单")
     private Boolean isSvip;

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/model/order/OrderProfitSharing.java

@@ -55,6 +55,9 @@ public class OrderProfitSharing implements Serializable {
     @ApiModelProperty(value = "商户分账金额")
     private BigDecimal profitSharingMerPrice;
 
+//    @ApiModelProperty(value = "骑手分账金额")
+//    private BigDecimal profitSharingRiderPrice;
+
     @ApiModelProperty(value = "一级返佣金额")
     private BigDecimal firstBrokerageFee;
 

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/response/OrderAdminDetailResponse.java

@@ -50,7 +50,8 @@ public class OrderAdminDetailResponse implements Serializable {
 
     @ApiModelProperty(value = "订单总价")
     private BigDecimal totalPrice;
-
+    @ApiModelProperty(value = "首单立减")
+    private BigDecimal firstDeducPrice;
     @ApiModelProperty(value = "优惠券金额")
     private BigDecimal couponPrice;
 

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/response/OrderFrontDetailResponse.java

@@ -57,7 +57,8 @@ public class OrderFrontDetailResponse implements Serializable {
 
     @ApiModelProperty(value = "优惠券金额")
     private BigDecimal couponPrice;
-
+    @ApiModelProperty(value = "首单立减")
+    private BigDecimal firstDeducPrice;
     @ApiModelProperty(value = "打包费")
     private BigDecimal packingFee;
 

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/response/PlatformOrderAdminDetailResponse.java

@@ -53,6 +53,8 @@ public class PlatformOrderAdminDetailResponse implements Serializable {
     private BigDecimal totalPrice;
     @ApiModelProperty(value = "打包费")
     private BigDecimal packingFee;
+    @ApiModelProperty(value = "首单立减")
+    private BigDecimal firstDeducPrice;
 
     @ApiModelProperty(value = "优惠券金额")
     private BigDecimal couponPrice;

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/response/PreOrderMerchantInfoResponse.java

@@ -48,7 +48,8 @@ public class PreOrderMerchantInfoResponse implements Serializable {
     private BigDecimal freightFee;
     @ApiModelProperty(value = "打包费用")
     private BigDecimal packingFee;
-
+    @ApiModelProperty(value = "首单立减")
+    private BigDecimal firstDeduc ;
     @ApiModelProperty(value = "优惠券编号（选择优惠券时有值,不选时为0")
     private Integer userCouponId = 0;
 

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/vo/MerchantVo.java

@@ -171,4 +171,6 @@ public class MerchantVo implements Serializable {
     private Integer isFreeDeliveFee;
     @ApiModelProperty(value = "首单立减")
     private BigDecimal firstReduc;
+    @ApiModelProperty(value = "是否有优惠措施 0无 1有")
+    private Integer hasMeasure;
 }

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/vo/PreMerchantOrderVo.java

@@ -46,7 +46,8 @@ public class PreMerchantOrderVo implements Serializable {
     private BigDecimal freightFee;
     @ApiModelProperty(value = "打包费用")
     private BigDecimal packingFee;
-
+    @ApiModelProperty(value = "首单立减")
+    private BigDecimal firstDeduc;
     @ApiModelProperty(value = "优惠券编号（选择优惠券时有值,不选时为0")
     private Integer userCouponId = 0;
 
@@ -100,4 +101,6 @@ public class PreMerchantOrderVo implements Serializable {
 
     @ApiModelProperty(value = "系统表单内容")
     private String systemFormValue = "";
+    @ApiModelProperty(value = "是否免配送费:0-否，1-是")
+    private Integer isFreeDeliveFee;
 }

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/vo/PreOrderInfoVo.java

@@ -42,6 +42,8 @@ public class PreOrderInfoVo implements Serializable {
     private Boolean isMerBearFreightFee=false;
     @ApiModelProperty(value = "打包费")
     private BigDecimal pickingFee = BigDecimal.ZERO;
+    @ApiModelProperty(value = "首单立减")
+    private BigDecimal firstDeduc = BigDecimal.ZERO;
     @ApiModelProperty(value = "是否商户承担")
     private Boolean isMerBearPickingFee=false;
     @ApiModelProperty(value = "优惠券优惠金额")