券码预交验

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateFatherSonOrderRequest.java

@@ -40,6 +40,8 @@ public class CreateFatherSonOrderRequest extends BaseConfig {
      */
     private String menuType;
 
+    private String openId;
+
     @Data
     public static class OrderInfo {
         /**

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderRequest.java

@@ -15,4 +15,5 @@ public class CreateOrderRequest extends BaseConfig {
      */
     MqMessageRequest mqMessageRequest;
 
+    private String openId;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -56,11 +56,13 @@ import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.request.vo.GetOrgTreeListRequest;
 import com.freemud.application.sdk.api.storecenter.response.GetStoreTableResponse;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
+import com.freemud.application.sdk.api.storecenter.response.vo.GetOrgTreeListResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.application.sdk.api.structure.MessageCenterType;
 import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
 import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
 import com.freemud.sdk.api.assortment.order.adapter.*;
+import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
 import com.freemud.sdk.api.assortment.order.entities.OrderEditInfo;
 import com.freemud.sdk.api.assortment.order.enums.*;
 import com.freemud.sdk.api.assortment.order.request.order.CreateOrderRequest;
@@ -134,7 +136,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             return getCreateOrderResponse(createOrderResponse.getErrcode().toString(), createOrderResponse.getErrmsg(), null);
         }
         BaseOrderResponse baseOrderResponse = updateStockAndScore(createOrderResponse.getData(), config.getBaseCreateOrderRequest().getProducts(), config.getBaseCreateOrderRequest().getActivityUpdateStockRequest(),
-                config.getBaseCreateOrderRequest().getAccounts(), config.getMqMessageRequest(),config.getBaseCreateOrderRequest().getMenuType());
+                config.getBaseCreateOrderRequest().getAccounts(), config.getMqMessageRequest(),config.getBaseCreateOrderRequest().getMenuType(),config.getOpenId());
         if (!RESPONSE_SUCCESS.equals(baseOrderResponse.getErrcode())) {
             return getCreateOrderResponse(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg(), null);
         }
@@ -155,7 +157,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         }
         CreateFatherSonOrderRequest.OrderInfo productOrderRequest = createFatherSonOrderRequest.getOrderInfoList().stream().filter(orderBeanTemp -> 1 == orderBeanTemp.getBizType()).collect(Collectors.toList()).get(0);
         BaseOrderResponse baseOrderResponse =updateStockAndScore(productOrderInfo.get(0), productOrderRequest.getProducts(), productOrderRequest.getActivityUpdateStockRequest(), productOrderRequest.getAccounts(),
-                createFatherSonOrderRequest.getMqMessageRequest(),createFatherSonOrderRequest.getMenuType());
+                createFatherSonOrderRequest.getMqMessageRequest(),createFatherSonOrderRequest.getMenuType(),createFatherSonOrderRequest.getOpenId());
         if (!RESPONSE_SUCCESS.equals(baseOrderResponse.getErrcode())) {
             return CreateFatherSonOrderResponse.error(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg());
         }
@@ -175,7 +177,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     }
 
     private BaseOrderResponse updateStockAndScore(OrderBean orderBean, List<CreateOrderProductRequest> products, ActivityUpdateStockRequest updateStockRequest,
-                                                  List<CreateOrderAccountRequest> accounts, MqMessageRequest mqMessageRequest,String menuType) {
+                                                  List<CreateOrderAccountRequest> accounts, MqMessageRequest mqMessageRequest,String menuType,String openId) {
         //TODO 转换获取库存信息,扣减库存
         UpdateStocksRequest updateStocksRequest = orderSdkAdapter.getUpdateProductStock(orderBean, products, StockChangeType.REDUCE,menuType);
         if (updateStocksRequest != null && CollectionUtils.isNotEmpty(updateStocksRequest.getProductStocks())) {
@@ -239,6 +241,21 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         return BaseOrderResponse.getErrorBaseOrderResponse(RESPONSE_SUCCESS_STR, "");
     }
 
+    List<String> getOrgCodes(String partnerId, String storeCode) {
+        GetOrgTreeListRequest request = new GetOrgTreeListRequest();
+        request.setPartnerId(partnerId);
+        request.setStoreCode(storeCode);
+        BaseResponse<GetOrgTreeListResponse> orgList = storeCenterService.getOrgTreeList(request, LogThreadLocal.getTrackingNo());
+        if (orgList != null && ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(orgList.getCode())) {
+            List<GetOrgTreeListResponse.OrgList> orgResponseList = orgList.getData().getOrgList();
+            if (CollectionUtils.isEmpty(orgResponseList)){
+                return null;
+            }
+            return orgResponseList.stream().map(org -> org.getOrganizationId()).collect(Collectors.toList());
+        }
+        return null;
+    }
+
     /**
      * 围餐更新库存和积分 
      */

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

@@ -2888,7 +2888,7 @@ public class OrderServiceImpl implements Orderservice {
             int cardOriginalAmount = shoppingCartGoodsDto.getCardOriginalAmount() == null ? 0 : shoppingCartGoodsDto.getCardOriginalAmount();
             int cardDiscountAmount = shoppingCartGoodsDto.getCardDiscountAmount() == null ? 0 : shoppingCartGoodsDto.getCardDiscountAmount();
             cardAmount = cardOriginalAmount - cardDiscountAmount;
-            CreateFatherSonOrderResponse createFatherSonOrderResponse = createFatherSonOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, orderExtendedReq, appId);
+            CreateFatherSonOrderResponse createFatherSonOrderResponse = createFatherSonOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, orderExtendedReq, appId,userLoginInfoDto.getOpenId());
             if (ObjectUtils.notEqual(Integer.valueOf(ResponseResult.SUCCESS.getCode()), createFatherSonOrderResponse.getErrcode())) {
                 return ResponseUtil.error(createFatherSonOrderResponse.getErrcode().toString(), createFatherSonOrderResponse.getErrmsg());
             }
@@ -2903,7 +2903,7 @@ public class OrderServiceImpl implements Orderservice {
             fatherBeanList.get(0).setCompanyId(createOrderVo.getPartnerId());
         } else {
             //普通订单
-            CreateOrderResponse createOrderFlowResponse = createOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, orderExtendedReq, orderClient, appId);
+            CreateOrderResponse createOrderFlowResponse = createOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, orderExtendedReq, orderClient, appId,userLoginInfoDto.getOpenId());
             if (ObjectUtils.notEqual(Integer.valueOf(ResponseResult.SUCCESS.getCode()), createOrderFlowResponse.getErrcode())) {
                 return ResponseUtil.error(createOrderFlowResponse.getErrcode().toString(), createOrderFlowResponse.getErrmsg());
             }
@@ -3082,7 +3082,7 @@ public class OrderServiceImpl implements Orderservice {
      * 创建普通订单
      */
     public CreateOrderResponse createOrder(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto, ShoppingCartGoodsDto shoppingCartGoodsDto,
-                                           OrderExtendedReq orderExtendedReq, OrderClientType orderClient, String appId) {
+                                           OrderExtendedReq orderExtendedReq, OrderClientType orderClient, String appId,String openId) {
         BaseCreateOrderRequest baseCreateOrderRequest = orderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto, storeResponseDto);
         //查询第三方商品编号
         baseCreateOrderRequest = getProductCustomerCode(baseCreateOrderRequest);
@@ -3093,6 +3093,7 @@ public class OrderServiceImpl implements Orderservice {
         CreateOrderRequest createOrderRequest = new CreateOrderRequest();
         baseCreateOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         createOrderRequest.setBaseCreateOrderRequest(baseCreateOrderRequest);
+        createOrderRequest.setOpenId(openId);
         MqMessageRequest mqMessageRequest = new MqMessageRequest();
         mqMessageRequest.setBackOrdersNotifyActivityExchange(backOrdersNotifyActivityExchange);
         mqMessageRequest.setBackOrdersNotifyActivityQueue(backOrdersChangeOrderStatusConsumerQueue);
@@ -3107,13 +3108,14 @@ public class OrderServiceImpl implements Orderservice {
      */
     public CreateFatherSonOrderResponse createFatherSonOrder(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto,
                                                              ShoppingCartGoodsDto shoppingCartGoodsDto, OrderExtendedReq orderExtendedReq,
-                                                             String appId) {
+                                                             String appId,String openId) {
         CreateFatherSonOrderRequest createFatherSonOrderRequest = orderAdapter.convertFatherSonOrderRequest(createOrderVo, shoppingCartGoodsDto, orderExtendedReq, storeResponseDto, appId);
         //查询第三方商品编号
         createFatherSonOrderRequest = getProductCustomerCodeNew(createFatherSonOrderRequest);
         MqMessageRequest mqMessageRequest = new MqMessageRequest();
         mqMessageRequest.setBackOrdersNotifyActivityExchange(backOrdersNotifyActivityExchange);
         mqMessageRequest.setBackOrdersNotifyActivityQueue(backOrdersChangeOrderStatusConsumerQueue);
+        createFatherSonOrderRequest.setOpenId(openId);
         createFatherSonOrderRequest.setMqMessageRequest(mqMessageRequest);
         return orderCenterSdkService.createFatherSonOrder(createFatherSonOrderRequest);
     }
@@ -3507,7 +3509,7 @@ public class OrderServiceImpl implements Orderservice {
     private BaseResponse createOrderAndPay(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto, ShoppingCartGoodsDto shoppingCartGoodsDto,
                                            AssortmentCustomerInfoVo userLoginInfoDto, OrderExtInfoDto orderExtInfoDTO) {
         //创建订单--包括下单购买会员卡创建父子订单
-        CreateOrderOperateDto operateDto = createOrderForFace(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto.getWxAppId());
+        CreateOrderOperateDto operateDto = createOrderForFace(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto.getWxAppId(),userLoginInfoDto.getOpenId());
         long totalAmount = operateDto.getTotalAmount();
         int cardAmount = operateDto.getCardAmount();
         QueryOrdersResponse.DataBean.OrderBean fatherOrderBean = operateDto.getFatherOrderBean();
@@ -3566,7 +3568,7 @@ public class OrderServiceImpl implements Orderservice {
      * 创建订单
      */
     private CreateOrderOperateDto createOrderForFace(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto,
-                                                     ShoppingCartGoodsDto shoppingCartGoodsDto, String appId) {
+                                                     ShoppingCartGoodsDto shoppingCartGoodsDto, String appId,String openId) {
         CreateOrderOperateDto response = new CreateOrderOperateDto();
         OrderExtendedReq orderExtendedReq = orderAdapter.saveStoreInfo(storeResponseDto);
         //创建普通订单
@@ -3584,6 +3586,7 @@ public class OrderServiceImpl implements Orderservice {
             mqMessageRequest.setBackOrdersNotifyActivityExchange(backOrdersNotifyActivityExchange);
             mqMessageRequest.setBackOrdersNotifyActivityQueue(backOrdersChangeOrderStatusConsumerQueue);
             createOrderRequest.setMqMessageRequest(mqMessageRequest);
+            createOrderRequest.setOpenId(openId);
             createOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
             return orderCenterSdkService.createOrderFlow(createOrderRequest);
         });
@@ -3595,6 +3598,7 @@ public class OrderServiceImpl implements Orderservice {
             MqMessageRequest mqMessageRequest = new MqMessageRequest();
             mqMessageRequest.setBackOrdersNotifyActivityExchange(backOrdersNotifyActivityExchange);
             mqMessageRequest.setBackOrdersNotifyActivityQueue(backOrdersChangeOrderStatusConsumerQueue);
+            createFatherSonOrderRequest.setOpenId(openId);
             createFatherSonOrderRequest.setMqMessageRequest(mqMessageRequest);
             return orderCenterSdkService.createFatherSonOrder(createFatherSonOrderRequest);
         });

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

@@ -10,6 +10,7 @@ import cn.freemud.utils.*;
 import com.freemud.application.sdk.api.base.BaseResponse;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.storecenter.request.vo.GetOrgTreeListRequest;
+import com.freemud.application.sdk.api.storecenter.response.vo.GetOrgTreeListResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
@@ -24,6 +25,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 @Service
 public class StoreServiceImpl implements StoreService {
@@ -201,9 +203,14 @@ public class StoreServiceImpl implements StoreService {
         request.setPartnerId(partnerId);
         request.setStoreCode(storeCode);
         StoreCenterService storeCenterService = SpringBeanUtil.getBean(StoreCenterService.class);
-        BaseResponse<List<String>> orgList = storeCenterService.getOrgList(request, LogThreadLocal.getTrackingNo());
+//        BaseResponse<List<String>> orgList = storeCenterService.getOrgList(request, LogThreadLocal.getTrackingNo());
+        BaseResponse<GetOrgTreeListResponse> orgList = storeCenterService.getOrgTreeList(request, LogThreadLocal.getTrackingNo());
         if (orgList != null && ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(orgList.getCode())) {
-            return orgList.getData();
+            List<GetOrgTreeListResponse.OrgList> orgResponseList = orgList.getData().getOrgList();
+            if (CollectionUtils.isEmpty(orgResponseList)){
+                return null;
+            }
+            return orgResponseList.stream().map(org -> org.getOrganizationId()).collect(Collectors.toList());
         }
         return null;
     }