订单合同新增接口

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DictEnum.java

@@ -93,6 +93,8 @@ public enum DictEnum {
     PREPAID_LIMIT_YES("prepaid_limit", "1","是"),
     CONSIGNMENT_WAY_1("consignment_way", "1", "采购方托运"),
     CONSIGNMENT_WAY_2("consignment_way", "2", "供应方托运"),
+    SETTLEMENT_WAY_1("settlement_way", "1", "线上结算"),
+    SETTLEMENT_WAY_2("settlement_way", "2", "线下结算"),
     ;
 
     private final String type;

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DictTypeEnum.java

@@ -51,6 +51,7 @@ public enum DictTypeEnum {
     WANT_BUY_STATUS("want_buy_status", "求购状态"),
     ORDER_SOURCE("order_source", "订单来源"),
     CONSIGNMENT_WAY("consignment_way", "托运方式"),
+    SETTLEMENT_WAY(" settlement_way", "结算方式"),
     ;
 
     private final String type;

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -1506,7 +1506,7 @@ public class KwcContractTradeService {
         tradeBaseInfo.setSigningWayDesc(DictEnum.getLabel(DictTypeEnum.SIGNING_WAY.getType(), String.valueOf(kwcContractTrade.getSigningWay())));
         tradeBaseInfo.setStartTime(kwcContractTrade.getStartTime());
         tradeBaseInfo.setSettlement(kwcContractTrade.getSettlement());
-        tradeBaseInfo.setSettlementDesc(DictEnum.getLabel(DictTypeEnum.SIGNING_TYPE.getType(),
+        tradeBaseInfo.setSettlementDesc(DictEnum.getLabel(DictTypeEnum.SETTLEMENT_WAY.getType(),
                 String.valueOf(kwcContractTrade.getSettlement())));
         tradeBaseInfo.setConsignment(kwcContractTrade.getConsignment());
         tradeBaseInfo.setConsignmentDesc(DictEnum.getLabel(DictTypeEnum.CONSIGNMENT_WAY.getType(),