修改回执bug

src/main/java/com/emato/ccnet/wx/biz/req/play/wx/WxplayResponse.java

@@ -83,7 +83,7 @@ public class WxplayResponse  implements CebCustomsResponse {
         if(CcnetContants.docStatus.item_12.getItem().equals(playResponse.getCusDeclStatus())){
             wxCuspayStatus.setSendStatus(Contants.SUCCESS_STATUS);
             wxCuspayStatus.setRespStatus(Contants.SUCCESS_STATUS);
-            wxOrder.setPayNo(playResponse.getAllPayNo());
+            wxOrder.setPayNo(playResponse.getMerchOrderSn());
             wxOrder.setBuyerPayCheck(playResponse.getBuyerPayerCheck());
             wxOrder.setPlayOrderStatus(WmContants.wmStatuses.item_2.getItem());
             Map<String, Object> recordMap = ImmutableMap.of("orderSn", wxOrder.getOrderSn(), "paymentSuccTime", new Date(),"isPaymentSend", Contants.WX_SUCC);

src/main/java/com/emato/ccnet/wx/biz/req/play/wx/WxplaySendDateAfter.java

@@ -66,7 +66,7 @@ public class WxplaySendDateAfter implements CebReqSendDateAfter {
                     wxCuspayStatusService.updatewxCuspayStatusServiceBatch(faileds);
                 } catch (Exception e) {
                     String info = "【WxPlay】更新【失败】报文订单记录失败";
-                    LOGGER.error("--- {}", info);
+                    LOGGER.error("--- {}", info,e);
                 }
             }
             //kmall中的支付单修改为待发送
@@ -75,7 +75,7 @@ public class WxplaySendDateAfter implements CebReqSendDateAfter {
                     wxOrderService.updateWxOrderStatusBatch(wxFaileds);
                 } catch (Exception e) {
                     String info = "【wmOrder】更新【失败】报文订单记录失败";
-                    LOGGER.error("--- {}", info);
+                    LOGGER.error("--- {}", info,e);
                 }
             }
         }

src/main/java/com/emato/ccnet/wx/biz/req/play/wx/WxplaySendDateRequet.java

@@ -209,7 +209,6 @@ public class WxplaySendDateRequet implements CebReqSendDate {
         WxPayDto wxPayDto = new WxPayDto();
         BeanUtil.copy(wxPayDoc, wxPayDto);
         wxPayDto.setMerchErpOrderSn(wxPayDoc.getWxCuspaySn());
-        wxPayDto.setSubOrderNo(wxPayDoc.getOutTradeNo());
         list.add(wxPayDto);
         String requestData = JacksonUtil.toJson(list);
         sPara.put("data", requestData);

src/main/java/com/emato/ccnet/wx/dto/ccnetdto/PlayResponse.java

@@ -35,6 +35,8 @@ public class PlayResponse implements Serializable{
 
     private String cusDeclStatus;
 
+    private String merchOrderSn;
+
     private String code;
 
     private String msg;
@@ -143,6 +145,14 @@ public class PlayResponse implements Serializable{
         this.cusDeclStatus = cusDeclStatus;
     }
 
+    public String getMerchOrderSn() {
+        return merchOrderSn;
+    }
+
+    public void setMerchOrderSn(String merchOrderSn) {
+        this.merchOrderSn = merchOrderSn;
+    }
+
     public String getAllOrderNo() {
         return allOrderNo;
     }

src/main/java/com/emato/ccnet/wx/service/impl/WxPayDocServiceImpl.java

@@ -186,9 +186,9 @@ public class WxPayDocServiceImpl implements WxPayDocService {
         wxPayDoc.setActionType("ADD");
         wxPayDoc.setSubOrderNo(wxOrder.getOrderSn());
         wxPayDoc.setFeeType("CNY");
-        wxPayDoc.setOrderFee(wxOrder.getActuralPaid().intValue());
+        wxPayDoc.setOrderFee(wxOrder.getActuralPaid().intValue()*100);
         wxPayDoc.setTransportFee(0);
-        wxPayDoc.setProductFee(wxOrder.getActuralPaid().intValue());
+        wxPayDoc.setProductFee(wxOrder.getActuralPaid().intValue()*100);
         wxPayDoc.setCertType("IDCARD");
         wxPayDoc.setCertId(wxOrder.getBuyerIdCode());
         wxPayDoc.setName(wxOrder.getBuyerName());

src/main/resources/application.yml

@@ -8,8 +8,8 @@ app:
 
 # 服务配置
 server:
-    address: 192.168.1.113
-    port: 8860
+    address: 183.3.221.143
+    port: 9580
     servlet:
         context-path: /
 
@@ -33,9 +33,9 @@ spring:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
-            url: jdbc:mysql://127.0.0.1:3306/ccnet_wx?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-            username: root
-            password: 111111
+            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/ccnet_wx?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            username: ccnet_wx
+            password: b$bFB*86yy
             hikari:
                 read-only: true
                 connection-timeout: 10000
@@ -48,9 +48,9 @@ spring:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
-            url: jdbc:mysql://120.76.84.45:3306/kmall_pt?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-            username: ceshi
-            password: abc-123
+            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_pt?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            username: kmall_pt
+            password: AFnwRBu!3q
             hikari:
                 read-only: true
                 connection-timeout: 10000
@@ -132,10 +132,6 @@ db:
 # 商户信息
 merchant:
     code: zwkj
-    #商户编号
-    merch-sn: mhbs990053989883052032
-    #商户名称
-    merch-name: 中网科技
     #平台编号
     plat-sn: 146001
     #平台中文名
@@ -169,7 +165,7 @@ cus:
         # 地址 http://wstest.ds-bay.com/bds/order 店提
         shop-url: http://ws.ds-bay.com/al/shop/bdd/cb/order
         # 备货
-        bds-url: http://ws.ds-bay.com/al/oms-controller-ws/bds/order
+        bds-url: http://ws.ds-bay.com/al/bds/order
         # 补货
         bdd-url: http://ws.ds-bay.com/al/bdd/supplement/order
         #校验
@@ -184,9 +180,9 @@ cus:
         current: wx
         wx:
             #微信公众ID
-            app-id: wx0686d352293be639
+            app-id: wxb6b30b1b14ee502a
             #微信支付商户号
-            mch-id: 1517534731
+            mch-id: 1501125641
             #财富通编号：
             pay-code: 440316T004
             #财富通备案名称：