Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop'

创建拼单时添加商户名称及门店名称

See merge request !23

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/CollageOrderSdkAdapter.java

@@ -29,7 +29,9 @@ public class CollageOrderSdkAdapter {
             map.put(CollageOrderCacheFields.COLLAGE_ID.getKey(), String.valueOf(collageOrder.getCollageId()));
             map.put(CollageOrderCacheFields.CREATE_COLLAGE_USER_ID.getKey(), String.valueOf(collageOrder.getCreateCollageUserId()));
             map.put(CollageOrderCacheFields.PARTNER_ID.getKey(), String.valueOf(collageOrder.getPartnerId()));
+            map.put(CollageOrderCacheFields.PARTNER_NAME.getKey(), String.valueOf(collageOrder.getPartnerName()));
             map.put(CollageOrderCacheFields.STORE_ID.getKey(), String.valueOf(collageOrder.getStoreId()));
+            map.put(CollageOrderCacheFields.STORE_NAME.getKey(), String.valueOf(collageOrder.getStoreName()));
             map.put(CollageOrderCacheFields.CREATE_TIME.getKey(), String.valueOf(collageOrder.getCreateTime()));
             map.put(CollageOrderCacheFields.EXPIRE_TIME.getKey(), String.valueOf(collageOrder.getExpireTime()));
         }
@@ -42,7 +44,9 @@ public class CollageOrderSdkAdapter {
                 .collageId(String.valueOf(map.get(CollageOrderCacheFields.COLLAGE_ID.getKey())))
                 .createCollageUserId(String.valueOf(map.get(CollageOrderCacheFields.CREATE_COLLAGE_USER_ID.getKey())))
                 .partnerId(String.valueOf(map.get(CollageOrderCacheFields.PARTNER_ID.getKey())))
+                .partnerName(String.valueOf(map.get(CollageOrderCacheFields.PARTNER_NAME.getKey())))
                 .storeId(String.valueOf(map.get(CollageOrderCacheFields.STORE_ID.getKey())))
+                .storeName(String.valueOf(map.get(CollageOrderCacheFields.STORE_NAME.getKey())))
                 .createTime(Long.parseLong(map.get(CollageOrderCacheFields.CREATE_TIME.getKey())))
                 .expireTime(Long.parseLong(map.get(CollageOrderCacheFields.EXPIRE_TIME.getKey())))
                 .build();
@@ -52,7 +56,9 @@ public class CollageOrderSdkAdapter {
         return CollageOrder.builder()
                 .collageId(collageOrderDto.getCollageId())
                 .partnerId(collageOrderDto.getPartnerId())
+                .partnerName(collageOrderDto.getPartnerName())
                 .storeId(collageOrderDto.getStoreId())
+                .storeName(collageOrderDto.getStoreName())
                 .createCollageUserId(collageOrderDto.getCreateCollageUserId())
                 .build();
     }

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/CollageOrderCacheFields.java

@@ -22,9 +22,11 @@ public enum CollageOrderCacheFields {
     COLLAGE_ID(0, "collageId", new TypeReference<String>(){}.getType(), "")
     ,CREATE_COLLAGE_USER_ID(1, "createCollageUserId", new TypeReference<String>(){}.getType(), "")
     ,PARTNER_ID(2, "partnerId", new TypeReference<String>(){}.getType(), "")
-    ,STORE_ID(3, "storeId", new TypeReference<String>(){}.getType(), "")
-    ,CREATE_TIME(4, "createTime", new TypeReference<Long>(){}.getType(), 0L)
-    ,EXPIRE_TIME(5, "expireTime", new TypeReference<Long>(){}.getType(), 0L)
+    ,PARTNER_NAME(3, "partnerName", new TypeReference<String>(){}.getType(), "")
+    ,STORE_ID(4, "storeId", new TypeReference<String>(){}.getType(), "")
+    ,STORE_NAME(5, "storeName", new TypeReference<String>(){}.getType(), "")
+    ,CREATE_TIME(6, "createTime", new TypeReference<Long>(){}.getType(), 0L)
+    ,EXPIRE_TIME(7, "expireTime", new TypeReference<Long>(){}.getType(), 0L)
     ;
 
     private Integer index;

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CollageOrder.java

@@ -33,11 +33,21 @@ public class CollageOrder
     private String partnerId;
 
     /**
+     * 商户名称
+     */
+    private String partnerName;
+
+    /**
      * 门店ID
      */
     private String storeId;
 
     /**
+     * 门店名称
+     */
+    private String storeName;
+
+    /**
      * 创建时间
      */
     private Long createTime;

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CollageOrderDto.java

@@ -40,11 +40,21 @@ public class CollageOrderDto
     private String partnerId;
 
     /**
+     * 商户名称
+     */
+    private String partnerName;
+
+    /**
      * 门店ID
      */
     private String storeId;
 
     /**
+     * 门店名称
+     */
+    private String storeName;
+
+    /**
      * 拼单当前用户ID
      */
     private String currentUserId;

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/CollageOrderBaseServiceImpl.java

@@ -140,6 +140,7 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
                     collageOrder.setCollageId(UUID.randomUUID().toString());
                     collageOrder.setCreateTime(DateTimeUtils.currentTimeMillis());
                     collageOrder.setExpireTime(DateTimeUtils.currentTimeMillis(60 * 60L));
+
                     // 创建缓存数据
                     this.putCollageBaseHash(collageBaseHashKey, collageOrder);
                     // 将拼单发起人加入拼单餐位
@@ -328,7 +329,12 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
     @Override
     public BaseResponse cleanMemberCartLine(CollageOrderDto collageOrderDto){
         String key = genCollageCarHashKey(collageOrderDto.getPartnerId(),collageOrderDto.getStoreId(),collageOrderDto.getCreateCollageUserId());
-        redisTemplate.boundHashOps(key).delete(collageOrderDto.getCartLines());
+        if (null != collageOrderDto.getCartLines() && collageOrderDto.getCartLines().size() > 0) {
+            collageOrderDto.getCartLines().forEach(cartLine -> {
+                redisTemplate.boundHashOps(key).delete(String.valueOf(cartLine));
+            });
+        }
+
         return CartResponseUtil.success();
     }
 

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

@@ -212,7 +212,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
         QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
 
-        if (!ResponseResultEnum.SUCCESS.getCode().equals(response.getErrcode()) || response.getData() == null) {
+        if (!ResponseResultEnum.SUCCESS.getCode().equals(String.valueOf(response.getErrcode())) || response.getData() == null) {
             return null;
         }
 

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

@@ -497,6 +497,8 @@ public class OrderServiceImpl implements Orderservice {
         newShoppingCartClearDto.setSessionId(sessionId);
         newShoppingCartClearDto.setOperationType(1);
         shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
+        shoppingCartClient.clearCollageOrder(newShoppingCartClearDto);
+
         if (StringUtils.isNotBlank(daySeq) && orderExtInfoDto != null && !OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
             String storeAddress = StringUtils.isNotBlank(orderBean.getAddress()) ? orderBean.getAddress() : "";
             orderBean.setAddress(storeAddress);

shopping-cart-application-service/src/main/java/cn/freemud/service/CommonService.java

@@ -5,7 +5,9 @@ import cn.freemud.utils.SpringBeanUtil;
 import com.freemud.application.sdk.api.base.BaseResponse;
 import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
+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.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.response.vo.GetOrgTreeListResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.google.common.base.Joiner;
@@ -76,4 +78,16 @@ public interface CommonService {
         return CollectionUtils.isNotEmpty(orgIdList) ? Joiner.on(",").join(orgIdList) : "";
     }
 
+    default StoreResponse.BizVO getStoreInfo(String partnerId, String storeCode) {
+        StoreInfoRequest request = new StoreInfoRequest();
+        request.setPartnerId(partnerId);
+        request.setStoreCode(storeCode);
+        StoreCenterService storeCenterService = SpringBeanUtil.getBean(StoreCenterService.class);
+        StoreResponse storeInfo = storeCenterService.getStoreInfo(request, LogThreadLocal.getTrackingNo());
+        if (storeInfo != null) {
+            return storeInfo.getBizVO();
+        }
+        return null;
+    }
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java

@@ -9,6 +9,7 @@ import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CollageOrderService;
 import cn.freemud.utils.ResponseUtil;
+import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CollageMemberStateType;
 import com.freemud.sdk.api.assortment.shoppingcart.domain.CollageMemberState;
 import com.freemud.sdk.api.assortment.shoppingcart.domain.CollageOrder;
@@ -44,6 +45,8 @@ public class CollageOrderServiceImpl implements CollageOrderService {
     private CollageOrderBaseServiceImpl collageOrderBaseService;
     @Autowired
     private ShoppingCartCollageServiceImpl shoppingCartCollageService;
+    @Autowired
+    private CommonServiceImpl commonService;
 
 
     /**
@@ -107,6 +110,13 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         collageOrderDto.setNickName(userInfo.getNickName());
         collageOrderDto.setPhotoUrl(userInfo.getPhotoUrl());
 
+        // 添加门店名称提供前端提示
+        StoreResponse.BizVO storeInfo = commonService.getStoreInfo(request.getPartnerId(), request.getShopId());
+        if (null != storeInfo) {
+            collageOrderDto.setPartnerName(storeInfo.getParentName());
+            collageOrderDto.setStoreName(storeInfo.getStoreName());
+        }
+
         // 创建拼单订单基础缓存信息
         BaseResponse<CollageOrder> createCollageOrderResponse = this.collageOrderBaseService.createCollageOrder(collageOrderDto);