fix:新增三明治流程相关字段

coolstore-partner-common/src/main/java/com/cool/store/utils/CommonUtil.java

@@ -0,0 +1,25 @@
+package com.cool.store.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 公告工具
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/10/29
+ */
+public class CommonUtil {
+    public static BigDecimal convertToBig(String value) {
+        if (StringUtils.isBlank(value)) {
+            return BigDecimal.ZERO;
+        }
+        try {
+            return new BigDecimal(value);
+        } catch (Exception ignored) {}
+        return BigDecimal.ZERO;
+    }
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java

@@ -72,4 +72,8 @@ public class FranchiseFeeDO {
     @ApiModelProperty("新管家已缴金额")
     private BigDecimal xgjFeesPaid;
 
+    @Column(name = "cashier_fee")
+    @ApiModelProperty("收银费(系统费)")
+    private String cashierFee;
+
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/OrderSysInfoDO.java

@@ -117,4 +117,8 @@ public class OrderSysInfoDO {
     /** 总部订货收款修改人 */
     @Column(name = "receiving_update_user")
     private String receivingUpdateUser;
+
+    /** 订货方式，0先款后货、1先货后款 */
+    @Column(name = "order_type")
+    private Integer orderType;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java

@@ -44,6 +44,8 @@ public class FranchiseFeeRequest {
     @ApiModelProperty("加盟费优惠原因")
     private String discountReason;
 
+    @ApiModelProperty("收银费(系统费)（三明治使用）")
+    private String cashierFee;
 
     public FranchiseFeeDO toFranchiseFeeDO() {
         FranchiseFeeDO franchiseFeeDO = new FranchiseFeeDO();
@@ -63,6 +65,7 @@ public class FranchiseFeeRequest {
         franchiseFeeDO.setThirdYearFee(this.thirdYearFee);
         franchiseFeeDO.setPerformanceBond(this.performanceBond);
         franchiseFeeDO.setDiscountReason(this.discountReason);
+        franchiseFeeDO.setCashierFee(this.cashierFee);
         return franchiseFeeDO;
     }
 }

coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java

@@ -95,6 +95,9 @@ public class OrderSysInfoRequest {
     @ApiModelProperty(value = "总部订货收款修改人" )
     private String receivingUpdateUser;
 
+    @ApiModelProperty("订货方式，0先款后货、1先货后款")
+    private Integer orderType;
+    
     public OrderSysInfoDO toOrderSysInfoDO() {
         OrderSysInfoDO orderSysInfoDO = new OrderSysInfoDO();
         orderSysInfoDO.setShopId(this.shopId);

coolstore-partner-model/src/main/java/com/cool/store/request/xgj/PushFranchiseFeeRequest.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import static com.cool.store.utils.CommonUtil.convertToBig;
+
 /**
  * @Author suzhuhong
  * @Date 2025/6/3 16:52
@@ -50,16 +52,18 @@ public class PushFranchiseFeeRequest {
         this.setShopId(shopId);
         this.setPartnerName(partnerName);
         this.setBillId(franchiseFeeDO.getId().intValue());
-        this.setFranchiseFee(new BigDecimal(franchiseFeeDO.getYearFranchiseFee()));
+        this.setFranchiseFee(convertToBig(franchiseFeeDO.getYearFranchiseFee()));
-        this.setBond(new BigDecimal(franchiseFeeDO.getLoanMargin()));
+        this.setBond(convertToBig(franchiseFeeDO.getLoanMargin()));
-        this.setFirstYearManageFee(new BigDecimal(franchiseFeeDO.getFirstYearManageFee()));
+        this.setFirstYearManageFee(convertToBig(franchiseFeeDO.getFirstYearManageFee()));
-        this.setFirstYearFee(new BigDecimal(franchiseFeeDO.getFirstYearFee()));
+        this.setFirstYearFee(convertToBig(franchiseFeeDO.getFirstYearFee()));
-        this.setDesignFee(new BigDecimal(franchiseFeeDO.getPerformanceBond()));
+        this.setDesignFee(convertToBig(franchiseFeeDO.getPerformanceBond()));
+        this.setFranchiseFee(convertToBig(franchiseFeeDO.getCashierFee()));
         this.setTotalFee(this.getBond()
                 .add(this.getFranchiseFee())
                 .add(this.getFirstYearManageFee())
                 .add(this.getFirstYearFee())
-                .add(this.getDesignFee()));
+                .add(this.getDesignFee())
+                .add(this.getFranchiseFee()));
         this.setCreateTime(franchiseFeeDO.getCreateTime());
     }
 

coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java

@@ -206,4 +206,7 @@ public class BuildInformationResponse {
 
     @ApiModelProperty(value = "建店资料当前阶段状态")
     private Integer shopSubStageStatus;
+
+    @ApiModelProperty("订货方式，0先款后货、1先货后款")
+    private Integer orderType;
 }

coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java

@@ -63,7 +63,8 @@ public class FranchiseFeeResponse {
     @ApiModelProperty("新管家已缴金额")
     private BigDecimal xgjFeesPaid;
 
-
+    @ApiModelProperty("收银费(系统费)")
+    private String cashierFee;
 
     @Data
     public static class LinePay{
@@ -200,6 +201,7 @@ public class FranchiseFeeResponse {
         franchiseFeeResponse.setXgjCollectionStatus(franchiseFeeDO.getXgjCollectionStatus());
         franchiseFeeResponse.setXgjRemainderPayableAmount(franchiseFeeDO.getXgjRemainderPayableAmount());
         franchiseFeeResponse.setXgjFeesPaid(franchiseFeeDO.getXgjFeesPaid());
+        franchiseFeeResponse.setCashierFee(franchiseFeeDO.getCashierFee());
         return franchiseFeeResponse;
     }
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java

@@ -213,6 +213,7 @@ public class BuildInformationServiceImpl implements BuildInformationService {
             response.setReceivingMsBankAccount(orderSysInfoDO.getReceivingMsBankAccount());
             response.setReceivingMsBankBranch(orderSysInfoDO.getReceivingMsBankBranch());
             response.setBankUnionPayAccount(orderSysInfoDO.getBankUnionPayAccount());
+            response.setOrderType(orderSysInfoDO.getOrderType());
             WarehouseInfoDO warehouseInfoDO = warehouseInfoMapper.getByCode(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse());
             if (Objects.nonNull(warehouseInfoDO)) {
                 response.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName());

coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java

@@ -143,6 +143,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
             orderSysInfoDO.setReceivingMsBankAccount(request.getReceivingMsBankAccount());
             orderSysInfoDO.setReceivingMsBankBranch(request.getReceivingMsBankBranch());
             orderSysInfoDO.setBankUnionPayAccount(request.getBankUnionPayAccount());
+            orderSysInfoDO.setOrderType(request.getOrderType());
             if (shopSubStageInfo.getShopSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus())) {
                 if (orderSysInfoDO.getReceivingCreateTime() == null) {
                     orderSysInfoDO.setReceivingCreateTime(new Date());

coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java

@@ -36,6 +36,7 @@ import java.util.stream.Collectors;
 
 import static com.cool.store.enums.UserRoleEnum.*;
 import static com.cool.store.enums.point.ShopSubStageStatusEnum.*;
+import static com.cool.store.utils.CommonUtil.convertToBig;
 
 @Service
 @Slf4j
@@ -554,11 +555,11 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
 
         } else {
             if (Objects.nonNull(franchiseFeeDO)) {
-                BigDecimal total = new BigDecimal(franchiseFeeDO.getYearFranchiseFee())
+                BigDecimal total = convertToBig(franchiseFeeDO.getYearFranchiseFee())
-                        .add(new BigDecimal(franchiseFeeDO.getLoanMargin()))
+                        .add(convertToBig(franchiseFeeDO.getLoanMargin()))
-                        .add(new BigDecimal(franchiseFeeDO.getFirstYearFee()))
+                        .add(convertToBig(franchiseFeeDO.getFirstYearFee()))
-                        .add(new BigDecimal(franchiseFeeDO.getFirstYearManageFee()))
+                        .add(convertToBig(franchiseFeeDO.getFirstYearManageFee()))
-                        .add(new BigDecimal(franchiseFeeDO.getPerformanceBond()));
+                        .add(convertToBig(franchiseFeeDO.getPerformanceBond()));
                 addSignFranchiseResponse.setContractAmount(total.toString());
             }
             addSignFranchiseResponse.setMobile(lineInfoDO.getMobile());
@@ -611,9 +612,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
 
         if (Objects.nonNull(franchiseFeeDO)) {
             addSignFranchiseResponse.setYearFranchiseFee(franchiseFeeDO.getYearFranchiseFee());
-            addSignFranchiseResponse.setBigYearFranchiseFee(Convert.digitToChinese(new BigDecimal(franchiseFeeDO.getYearFranchiseFee())));
+            addSignFranchiseResponse.setBigYearFranchiseFee(Convert.digitToChinese(convertToBig(franchiseFeeDO.getYearFranchiseFee())));
             addSignFranchiseResponse.setLoanMargin(franchiseFeeDO.getLoanMargin());
-            addSignFranchiseResponse.setBigLoanMargin(Convert.digitToChinese(new BigDecimal(franchiseFeeDO.getLoanMargin())));
+            addSignFranchiseResponse.setBigLoanMargin(Convert.digitToChinese(convertToBig(franchiseFeeDO.getLoanMargin())));
             addSignFranchiseResponse.setFirstYearStartTime(franchiseFeeDO.getFirstYearStartTime());
             addSignFranchiseResponse.setFirstYearEndTime(franchiseFeeDO.getFirstYearEndTime());
             addSignFranchiseResponse.setFirstYearFee(franchiseFeeDO.getFirstYearFee());
@@ -625,7 +626,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
             addSignFranchiseResponse.setThirdYearEndTime(franchiseFeeDO.getThirdYearEndTime());
             addSignFranchiseResponse.setThirdYearFee(franchiseFeeDO.getThirdYearFee());
             addSignFranchiseResponse.setPerformanceBond(franchiseFeeDO.getPerformanceBond());
-            addSignFranchiseResponse.setBigPerformanceBond(Convert.digitToChinese(new BigDecimal(franchiseFeeDO.getPerformanceBond())));
+            addSignFranchiseResponse.setBigPerformanceBond(Convert.digitToChinese(convertToBig(franchiseFeeDO.getPerformanceBond())));
         }
         return addSignFranchiseResponse;
     }