华莱士

order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java

@@ -9,6 +9,7 @@ import cn.freemud.entities.dto.promotion.CalculationDiscountGoodsDto;
 import cn.freemud.entities.dto.promotion.CalculationDiscountRequestDto;
 import cn.freemud.entities.dto.promotion.GroupWorkQueryRequest;
 import cn.freemud.entities.dto.promotion.GroupWorkRefundRequest;
+import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
@@ -91,6 +92,10 @@ public class SpellGroupOrderAdapter {
         orderExtendedReq.setStoreNameEn(storeInfo.getStoreNameEn());
         orderExtendedReq.setSpellGroupCode(createSpellGroupOrderDto.getSpellGroupCode());
         createOrderRequest.setOrderExtended(orderExtendedReq);
+
+        OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto();
+        orderExtInfoDto.setSessionId(createSpellGroupOrderDto.getSessionId());
+        createOrderRequest.setExtInfo(JSONObject.toJSONString(orderExtInfoDto));
         /**
          * 处理商品优惠信息  OrderItemCreateReq
          * 现阶段拼单商品只有一个，直接取0.后面拓展需要写循环。基本不会动
@@ -153,7 +158,9 @@ public class SpellGroupOrderAdapter {
         requestDto.setOpenId(userLoginInfoDto.getOpenId());
         requestDto.setTotalAmount(data.getActualPayAmount().longValue());
         requestDto.setCardAmount(0);
-        requestDto.setOrderExtInfoDTO(new OrderExtInfoDto());
+        OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto();
+        orderExtInfoDto.setSessionId(userLoginInfoDto.getSessionId());
+        requestDto.setOrderExtInfoDTO(orderExtInfoDto);
         requestDto.setTransId(data.getOid());
         requestDto.setOrderClient(OrderClientType.getOrderClientType(Integer.valueOf(data.getOrderClient())));
         requestDto.setProductOrderBean(data);

order-application-service/src/main/java/cn/freemud/entities/dto/order/CreatePrepayRequestDto.java

@@ -73,4 +73,6 @@ public class CreatePrepayRequestDto {
     private CreateOrderVo.UnionPayCard unionPayCard;
     private String storeId;
     private String channel;
+
+    private String sessionId;
 }

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

@@ -177,19 +177,19 @@ public class SpellGroupOrderDataManager {
         return memberInfoResp;
     }
 
-    public GroupWorkJoinResponse groupWorkJoin(QueryOrdersResponseDto.DataBean.OrderBean orderBean,GetMemberInfoByChannelResponseDto.ResultBean memberInfo){
+    public GroupWorkJoinResponse groupWorkJoin(QueryOrdersResponseDto.DataBean.OrderBean orderBean,AssortmentCustomerInfoVo userLoginInfoDto){
         GroupWorkJoinRequest groupWorkJoinRequest = new GroupWorkJoinRequest();
         QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean = orderBean.getProductList().get(0);
         groupWorkJoinRequest.setActivityCode(orderBean.getOrderSettlementDetailList().get(0).getExternalObjectId());
         groupWorkJoinRequest.setGoodId(productBean.getProductId());
         groupWorkJoinRequest.setGoodName(productBean.getProductName());
         groupWorkJoinRequest.setGroupId(orderBean.getSpellGroupCode());
-        groupWorkJoinRequest.setHeadUrl(memberInfo.getPhotoUrl());
+        groupWorkJoinRequest.setHeadUrl(userLoginInfoDto.getPhotoUrl());
         groupWorkJoinRequest.setOrderId(orderBean.getOid());
         groupWorkJoinRequest.setUserId(orderBean.getUserId());
         groupWorkJoinRequest.setUserName(orderBean.getUserName());
         groupWorkJoinRequest.setPartnerCode(orderBean.getCompanyId());
-        groupWorkJoinRequest.setMobile(memberInfo.getMobile());
+        groupWorkJoinRequest.setMobile(userLoginInfoDto.getMobile());
         log.info(JSON.toJSONString(groupWorkJoinRequest));
         GroupWorkJoinResponse groupWorkJoinResponse = promotionDiscountClient.groupWorkJoin(groupWorkJoinRequest);
         if(!ResponseResult.SUCCESS.getCode().equals(groupWorkJoinResponse.getStatusCode()) || groupWorkJoinResponse.getResult() == null){

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

@@ -440,12 +440,9 @@ public class MallOrderServiceImpl implements MallOrderService {
         List<String> orderIds = new ArrayList<>();
         //拼单调促销开团
         if(OrderMarketType.GROUPB.getIndex() == orderBean.getMarketingType()){
-            GetMemberInfoByIdResponseDto responseDto = spellGroupOrderDataManager.getMemberInfoById(orderBean.getUserId(),orderBean.getCompanyId());
-            if(responseDto == null){
-                orderRefund(orderBean, "查询用户信息异常,退款流程");
-                return gson.toJson(message);
-            }
-            GroupWorkJoinResponse groupWorkJoinResponse = spellGroupOrderDataManager.groupWorkJoin(orderBean,responseDto.getData());
+            AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId);
+
+            GroupWorkJoinResponse groupWorkJoinResponse = spellGroupOrderDataManager.groupWorkJoin(orderBean,userLoginInfoDto);
             if(groupWorkJoinResponse == null){
                 orderRefund(orderBean, "促销开团异常,退款流程");
                 return gson.toJson(message);

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

@@ -183,6 +183,7 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
         }
         //创建支付
         CreatePrepayRequestDto createPrepayRequestDto = spellGroupOrderAdapter.convertToCreatePrepayRequest(userLoginInfoDto, createOrderResponse.getData(), trackingNo);
+
         return orderService.createPrepayOrder(createPrepayRequestDto);
     }