华莱士

order-application-service/src/main/java/cn/freemud/manager/SpellGroupOrderDataManager.java

@@ -160,12 +160,9 @@ public class SpellGroupOrderDataManager {
         groupWorkJoinRequest.setUserId(orderBean.getUserId());
         groupWorkJoinRequest.setUserName(orderBean.getUserName());
         groupWorkJoinRequest.setPartnerCode(orderBean.getCompanyId());
-        groupWorkJoinRequest.setMobile(userLoginInfoDto.getMobile());
+        groupWorkJoinRequest.setMobile(StringUtils.isEmpty(userLoginInfoDto.getMobile()) ? orderBean.getPhone() : userLoginInfoDto.getMobile());
         log.info(JSON.toJSONString(groupWorkJoinRequest));
         GroupWorkJoinResponse groupWorkJoinResponse = promotionDiscountClient.groupWorkJoin(groupWorkJoinRequest);
-        if(!ResponseResult.SUCCESS.getCode().equals(groupWorkJoinResponse.getStatusCode()) || groupWorkJoinResponse.getResult() == null){
-            return null;
-        }
         return groupWorkJoinResponse;
     }
 

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

@@ -441,12 +441,12 @@ public class MallOrderServiceImpl implements MallOrderService {
         //拼单调促销开团
         if(OrderMarketType.GROUPB.getIndex() == orderBean.getMarketingType()){
             AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId);
-
             GroupWorkJoinResponse groupWorkJoinResponse = spellGroupOrderDataManager.groupWorkJoin(orderBean,userLoginInfoDto);
-            if(groupWorkJoinResponse == null){
-                orderRefund(orderBean, "促销开团异常,退款流程");
+            if(!ResponseResult.SUCCESS.getCode().equals(groupWorkJoinResponse.getStatusCode()) || groupWorkJoinResponse.getResult() == null){
+                orderRefund(orderBean, groupWorkJoinResponse.getMsg());
                 return gson.toJson(message);
             }
+
             if("2".equals(groupWorkJoinResponse.getResult().getGroupStatus())){
                 orderRefund(orderBean, "成团失败,退款流程");
                 return gson.toJson(message);