hyq 5 éve
szülő
commit
206a46653d

+ 2 - 1
src/main/java/com/emato/ccnet/wx/service/impl/WxOrderServiceImpl.java

@@ -194,13 +194,14 @@ public class WxOrderServiceImpl implements WxOrderService {
 
         BigDecimal freight = new BigDecimal(0);
         BigDecimal discount = new BigDecimal(0);
+//        discount = wxOrderDate.getCouponPrice();
         wxOrder.setFreight(freight);
         wxOrder.setDiscount(discount);
 
         wxOrder.setActuralPaid(wxOrderDate.getActuralPaid());
 
         wxOrder.setExprType(cus.getWaybill().get("exprType"));
-        if (!CcnetContants.wsFlag.item_00.getItem().equals(wxOrderDate.getWsFlag())) {
+        if (!CcnetContants.wsFlag.item_10.getItem().equals(wxOrderDate.getWsFlag())) {
             wxOrder.setExprCompId(cus.getWaybill().get("exprComrId"));
         } else {
             wxOrder.setExprCompId("emato");

+ 2 - 2
src/main/resources/application-dev.yml

@@ -112,9 +112,9 @@ cus:
         #校验
         check-url: http://127.0.0.1:8080/al/cbnf/buyerPayer/check
         # 快递公司标识
-        exprComrId: yunda
+        exprComrId: yto
         # 快递类型
-        exprType: '00'
+        exprType: '60'
 
     #支付信息
     play:

+ 2 - 2
src/main/resources/application-global.yml

@@ -126,9 +126,9 @@ cus:
         #校验
         check-url: http://ws.ds-bay.com/al/cbnf/buyerPayer/check
         # 快递公司标识
-        exprComrId: yunda
+        exprComrId: yto
         # 快递类型
-        exprType: '00'
+        exprType: '60'
 
     #支付信息
     play:

+ 2 - 2
src/main/resources/application-test.yml

@@ -127,9 +127,9 @@ cus:
         #校验
         check-url: http://192.168.1.251:8680/oms-controller-ws/cbnf/buyerPayer/check
         # 快递公司标识
-        exprComrId: yunda
+        exprComrId: yto
         # 快递类型
-        exprType: '00'
+        exprType: '60'
 
     #支付信息
     play:

+ 2 - 2
src/main/resources/application.yml

@@ -189,9 +189,9 @@ cus:
         #校验
         check-url: http://ws.ds-bay.com/al/cbnf/buyerPayer/check
         # 快递公司标识
-        exprComrId: yunda
+        exprComrId: yto
         # 快递类型
-        exprType: '00'
+        exprType: '60'
 
     #支付信息
     play: