上报数据处理

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-application-service/src/main/java/cn/freemud/handler/WeChatLiveMsgHandle.java

@@ -60,7 +60,7 @@ public class WeChatLiveMsgHandle {
 
     /**
      * @param orderBean
-     * @param flag      0 支付成功
+     * @param flag      1:支付成功,2:支付失败,3:用户取消,4:超时未支付;5:商家取消;10:其他原因取消
      */
     public void reportOrderStatus(OrderBeanV1 orderBean, int flag) {
         if (Objects.nonNull(orderBean)
@@ -78,7 +78,7 @@ public class WeChatLiveMsgHandle {
             // 需要拿到 openid
             Object openid = jsonObject.get("openid");
             request.setOpenid(Objects.isNull(openid) ? "" : openid.toString());
-            if (flag == 0) {
+            if (flag == 1) {
 
 //                Object payTransId = jsonObject.get("payTransId");
 //                request.setTransaction_id(Objects.isNull(payTransId) ? "" : payTransId.toString());
@@ -87,6 +87,7 @@ public class WeChatLiveMsgHandle {
                 Object payDate = jsonObject.get("payDate");
                 request.setPay_time(Objects.isNull(payDate) ? "" : payDate.toString());
             }
+            request.setAction_type(flag);
 
             // 获取 session
             String accessToken = this.getAccessToken(orderBean.getAppId(), orderBean.getParentCode());

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1806,7 +1806,7 @@ public class OrderServiceImpl implements Orderservice {
         // TODO: 2019/9/10 删除订单通知
         orderQueueService.backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
 
-        weChatLiveMsgHandle.reportOrderStatus(orderBean,0);
+        weChatLiveMsgHandle.reportOrderStatus(orderBean,3);
         return ResponseUtil.success();
     }
 

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -1028,7 +1028,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
 
         // fisherman 直播卖券-> 需要额外上报  时间来不及 有时间 这一块需要移到 异步调用
         try {
-            weChatLiveMsgHandle.reportOrderStatus(orderBean, 0);
+            weChatLiveMsgHandle.reportOrderStatus(orderBean, 1);
         }catch (Exception e){
             // 不要影响主流程
         }