华莱士开团促销需新增appId

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

@@ -146,7 +146,7 @@ public class SpellGroupOrderDataManager {
     }
 
 
-    public GroupWorkJoinResponse groupWorkJoin(QueryOrdersResponseDto.DataBean.OrderBean orderBean,AssortmentCustomerInfoVo userLoginInfoDto){
+    public GroupWorkJoinResponse groupWorkJoin(QueryOrdersResponseDto.DataBean.OrderBean orderBean,AssortmentCustomerInfoVo userLoginInfoDto,String wxappid){
         GroupWorkJoinRequest groupWorkJoinRequest = new GroupWorkJoinRequest();
         QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean = orderBean.getProductList().get(0);
         groupWorkJoinRequest.setActivityCode(orderBean.getOrderSettlementDetailList().get(0).getExternalObjectId());
@@ -158,7 +158,7 @@ public class SpellGroupOrderDataManager {
         groupWorkJoinRequest.setUserId(orderBean.getUserId());
         groupWorkJoinRequest.setUserName(orderBean.getUserName());
         groupWorkJoinRequest.setPartnerCode(orderBean.getCompanyId());
-        groupWorkJoinRequest.setAppId(userLoginInfoDto.getAppId());
+        groupWorkJoinRequest.setAppId(wxappid);
         groupWorkJoinRequest.setMobile(StringUtils.isEmpty(userLoginInfoDto.getMobile()) ? orderBean.getPhone() : userLoginInfoDto.getMobile());
         log.info(JSON.toJSONString(groupWorkJoinRequest));
         GroupWorkJoinResponse groupWorkJoinResponse = promotionDiscountClient.groupWorkJoin(groupWorkJoinRequest);

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

@@ -456,7 +456,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         //拼单调促销开团
         if(OrderMarketType.GROUPB.getIndex() == orderBean.getMarketingType()){
             AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId);
-            GroupWorkJoinResponse groupWorkJoinResponse = spellGroupOrderDataManager.groupWorkJoin(orderBean,userLoginInfoDto);
+            GroupWorkJoinResponse groupWorkJoinResponse = spellGroupOrderDataManager.groupWorkJoin(orderBean,userLoginInfoDto,wxappid);
             if(!ResponseResult.SUCCESS.getCode().equals(groupWorkJoinResponse.getStatusCode()) || groupWorkJoinResponse.getResult() == null){
                 orderRefund(orderBean, groupWorkJoinResponse.getMsg());
                 backOrdersNotifyActivity(orderBean, backOrdersChangeOrderStatusConsumerQueue, backOrdersNotifyActivityExchange);