华莱士

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

@@ -423,14 +423,11 @@ public class MallOrderServiceImpl implements MallOrderService {
                 sessionId = orderExtInfoDto.getSessionId();
             }
         }
-
         // 如果订单状态不是未支付，返回信息
         if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
             return sendPaySuccessNoticeMessage();
         }
 
-
-
         // 订单失败后 发消息重试 待实现
         PayAccessResponse payAccessResponse;
         ConfirmOrderRequest confirmOrderRequest = LightApplicationConvertToAssortmentSdkAdapter.confirmOrderDtoConvertToConfirmOrderRequest(confirmOrderDto, null);
@@ -442,18 +439,18 @@ public class MallOrderServiceImpl implements MallOrderService {
 
         //拼单调促销开团
         if(OrderMarketType.GROUPB.getIndex() == orderBean.getMarketingType()){
-//            GroupWorkJoinResponse groupWorkJoinResponse = spellGroupOrderDataManager.groupWorkJoin(orderBean,sessionId);
-//            if(groupWorkJoinResponse == null){
-//                orderRefund(orderBean, "促销开团异常,退款流程");
-//                return gson.toJson(message);
-//            }
-//            if("2".equals(groupWorkJoinResponse.getResult().getGroupStatus())){
-//                orderRefund(orderBean, "成团失败,退款流程");
-//                return gson.toJson(message);
-//            }
+            GroupWorkJoinResponse groupWorkJoinResponse = spellGroupOrderDataManager.groupWorkJoin(orderBean,sessionId);
+            if(groupWorkJoinResponse == null){
+                orderRefund(orderBean, "促销开团异常,退款流程");
+                return gson.toJson(message);
+            }
+            if("2".equals(groupWorkJoinResponse.getResult().getGroupStatus())){
+                orderRefund(orderBean, "成团失败,退款流程");
+                return gson.toJson(message);
+            }
             if(StringUtils.isEmpty(orderBean.getSpellGroupCode())){
-//                confirmOrderRequest.setSpellGroupCode(groupWorkJoinResponse.getResult().getGroupId());
-                confirmOrderRequest.setSpellGroupCode("spe23132123");
+                confirmOrderRequest.setSpellGroupCode(groupWorkJoinResponse.getResult().getGroupId());
+//              confirmOrderRequest.setSpellGroupCode("spe23132123");
             }
         }