去除微信上传无用代码

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -54,10 +54,6 @@ public class OrderCallBackMQService {
 
     @Autowired
     private OrderDistributionService orderDistributionService;
-    @Autowired
-    private RedisCache redisCache;
-    @Autowired
-    private AssortmentOpenPlatformWxappManager openPlatformWxappManager;
 
     public void sendOrderMQ(OrderCallBackRequestVo body) {
         //发送订单回调
@@ -70,25 +66,6 @@ public class OrderCallBackMQService {
         if (orderInfoReqs != null) {
             orderDistributionService.pushOrder(convent2DisRequest(body, orderInfoReqs.getOrderState()));
         }
-        //微信数据上传（创建新订单&支付成功时上传）
-        sendWechatReportMQ(body);
-    }
-
-    private void sendWechatReportMQ(OrderCallBackRequestVo body) {
-        try {
-            OrderInfoReqs orderInfoReqs = getWechatReportOrderInfoReqs(body);
-            if (orderInfoReqs != null) {
-                OrderExtInfoDto orderExtInfoDto = JSONObject.parseObject(orderInfoReqs.getExtInfo(), OrderExtInfoDto.class);
-                UserLoginInfoDto userLoginInfoDto = getUserLoginInfoBySessionId(orderExtInfoDto.getSessionId());
-                WechatReportOrderDto wechatReportOrderDto = getWechatReportOrderDto(orderInfoReqs, orderExtInfoDto, userLoginInfoDto);
-                Header header = new Header(MQAction.UPDATE.getAction(), "call-back-service-api",
-                        OrderCallBackConfig.QUEUE_ROUTING_KEY, OrderCallBackConfig.QUEUE_NAME);
-                MQMessage<WechatReportOrderDto> message = new MQMessage<>(header, wechatReportOrderDto);
-                mqService.convertAndSend("wechat-report-queue", "wechat-report-queue-routing-key", message);
-            }
-        } catch (Exception ex) {
-
-        }
     }
 
     private DisRequest convent2DisRequest(OrderCallBackRequestVo orderBean, Integer orderState) {
@@ -120,77 +97,4 @@ public class OrderCallBackMQService {
         }
         return orderInfoReqs;
     }
-
-    private OrderInfoReqs getWechatReportOrderInfoReqs(OrderCallBackRequestVo body) {
-        // 订单所有状态正常变化通知通知开放平台
-        if (!ObjectUtils.equals("1", body.getMsgType()) || body.getOperateType() == null || body.getOperateType() == 2) {
-            return null;
-        }
-        try {
-            OrderInfoReqs orderInfoReqs = JSONObject.parseObject(body.getContent(), OrderInfoReqs.class);
-            if (orderInfoReqs != null && OrderClientType.SAAS.getIndex().equals(orderInfoReqs.getOrderClient()) &&
-                    ((body.getOperateType() == 0 && NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderInfoReqs.getOrderState())) ||
-                            (body.getOperateType() == 1 && NewOrderStatus.COMPLETE.getIndex().equals(orderInfoReqs.getOrderState())))) {
-                return orderInfoReqs;
-            }
-        } catch (Exception ex) {
-            ErrorLog.infoConvertJson(context.getEnvironment().getProperty("spring.application.name"), LogThreadLocal.getTrackingNo(), this.getClass(), "parseObjectOrderInfoReqsError", ex);
-            return null;
-        }
-        return null;
-    }
-
-    private UserLoginInfoDto getUserLoginInfoBySessionId(String sessionId) {
-        String redisKey = RedisKeyConstant.SAAS_USER_INFO_SESSIONID_KEY_PREFIX + sessionId;
-        Map<String, Object> map = redisCache.getValue(redisKey);
-        UserLoginInfoDto userLoginInfoDto = new UserLoginInfoDto();
-        userLoginInfoDto.setOpenId(String.valueOf(map.get("openid")));
-        userLoginInfoDto.setWxAppid(String.valueOf(map.get("wxAppid")));
-        userLoginInfoDto.setSessionKey(String.valueOf(map.get("session_key")));
-        userLoginInfoDto.setMobile(String.valueOf(map.get("mobile")));
-        userLoginInfoDto.setAppsecret(String.valueOf(map.get("appsecret")));
-        userLoginInfoDto.setMemberId(String.valueOf(map.get("memberId")));
-        userLoginInfoDto.setPartnerId(String.valueOf(map.get("partnerId")));
-        userLoginInfoDto.setUnionId(String.valueOf(map.get("unionId")));
-        userLoginInfoDto.setNewMemeber(Boolean.valueOf(map.get("newMember").toString()));
-        userLoginInfoDto.setNickName(String.valueOf(map.get("nickName")));
-        return userLoginInfoDto;
-    }
-
-    private WechatReportOrderDto getWechatReportOrderDto(OrderInfoReqs orderInfoReqs, OrderExtInfoDto orderExtInfoDto, UserLoginInfoDto userLoginInfoDto) {
-        WechatReportOrderDto wechatReportOrderDto = new WechatReportOrderDto();
-        wechatReportOrderDto.setPartnerId(orderInfoReqs.getPartnerId());
-        wechatReportOrderDto.setSub_mchid(orderExtInfoDto.getPlatformMchId());
-        if (StringUtils.isBlank(orderExtInfoDto.getPlatformMchId())) {
-            // 获取当前商户微信支付mchId
-            AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(userLoginInfoDto.getPartnerId(), userLoginInfoDto.getWxAppid());
-            wechatReportOrderDto.setSub_mchid(wxApp == null ? "" : wxApp.getMchId());
-        }
-        wechatReportOrderDto.setPayVoucher(orderInfoReqs.getPayRequestNo());
-        wechatReportOrderDto.setSub_appid(userLoginInfoDto.getWxAppid());
-        wechatReportOrderDto.setOut_shop_no(orderInfoReqs.getStoreId());
-        wechatReportOrderDto.setSub_openid(userLoginInfoDto.getOpenId());
-        wechatReportOrderDto.setLogin_token(userLoginInfoDto.getSessionKey());
-        wechatReportOrderDto.setUser_amount(orderInfoReqs.getActualPayAmount().intValue());
-        wechatReportOrderDto.setOut_order_no(orderInfoReqs.getOrderCode());
-        wechatReportOrderDto.setTransaction_id(orderExtInfoDto.getPaid_no());
-        wechatReportOrderDto.setOut_trade_no(orderExtInfoDto.getPayTransId());
-        wechatReportOrderDto.setTotal_amount(orderInfoReqs.getOriginalAmount().intValue());
-        wechatReportOrderDto.setDiscount_amount(orderInfoReqs.getSettlementAmount().intValue());
-        //订单状态 (CREATE_DEAL—用户下单；PAY_SUCCESS—支付完成)
-        wechatReportOrderDto.setStatus(NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderInfoReqs.getOrderState()) ? "CREATE_DEAL" : "PAY_SUCCESS");
-
-        List<WechatReportOrderDto.DishInfo> list = new ArrayList<>();
-        for (OrderItemResp item : orderInfoReqs.getOrderItemList()) {
-            WechatReportOrderDto.DishInfo dishInfo = new WechatReportOrderDto.DishInfo();
-            dishInfo.setOut_dish_no(item.getProductId());
-            dishInfo.setCount(item.getProductQuantity());
-            dishInfo.setName(item.getProductName());
-            dishInfo.setPrice(item.getProductPrice().intValue());
-            list.add(dishInfo);
-        }
-        wechatReportOrderDto.setDish_list(list);
-        return wechatReportOrderDto;
-    }
-
 }

push-order-service/pom.xml

@@ -108,11 +108,11 @@
             <groupId>cn.freemud.commons</groupId>
             <artifactId>commons-redis</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
             <version>2.7.4.RELEASE</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>membercenter-sdk</artifactId>
@@ -133,7 +133,7 @@
             <artifactId>sdk-common-base</artifactId>
             <version>1.2.RELEASE</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
             <version>6.4.2.RELEASE</version>
@@ -143,7 +143,7 @@
                     <artifactId>sdk-common-base</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.ctrip.framework.apollo</groupId>
             <artifactId>apollo-client</artifactId>