Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group

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

@@ -11,6 +11,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.domain.CollagePartnerMember;
 import com.freemud.sdk.api.assortment.shoppingcart.service.CollageOrderBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil;
 import com.freemud.sdk.api.assortment.shoppingcart.util.DateTimeUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -58,15 +59,18 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
      */
     @Override
     public BaseResponse<CollageOrder> queryCollageOrder(CollageOrderDto collageOrderDto) {
+        CollageOrder collageOrder = null;
         try {
+            // 仅支持两种查询场景
+            // 1、createCollageUserId存在，则只根据当前三要素查询，若无直接返回不存在
+            if (StringUtils.isNotBlank(collageOrderDto.getCreateCollageUserId())) {
                 // 通过商户ID、门店ID、用户ID组装拼单订单Redis缓存基本信息Key
                 String collageBaseHashKey = this.genCollageBaseHashKey(collageOrderDto.getPartnerId(), collageOrderDto.getStoreId(), collageOrderDto.getCreateCollageUserId());
-
                 // 查询Redis缓存中拼单订单基础信息
-            CollageOrder collageOrder = this.getCollageBaseHash(collageBaseHashKey);
-
-            // 若按发起人维度查询不到，则按参与人维度查询
-            if (ObjectUtils.isEmpty(collageOrder)) {
+                collageOrder = this.getCollageBaseHash(collageBaseHashKey);
+            }
+            // 2、createCollageUserId不存在，则只从当前商户拼单参与人信息列表中查询并返回，若商户级别拼单不存在，则提示拼单不存在
+            else {
                 String collagePartnerMemberHashKey = this.genCollagePartnerMemberHashKey(collageOrderDto.getPartnerId());
                 CollagePartnerMember collagePartnerMember = this.getCollagePartnerMember(collagePartnerMemberHashKey, collageOrderDto.getCurrentUserId());
 
@@ -79,16 +83,13 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
                     return CartResponseUtil.error(CollageOrderConstant.COLLAGE_ORDER_NOT_EXIST);
                 } else {
                     // 从商户拼单参与人列表中获取信息再次查询拼单信息
-                    collageBaseHashKey = this.genCollageBaseHashKey(collagePartnerMember.getPartnerId(), collagePartnerMember.getStoreId(), collagePartnerMember.getCreateCollageUserId());
+                    String collageBaseHashKey = this.genCollageBaseHashKey(collagePartnerMember.getPartnerId(), collagePartnerMember.getStoreId(), collagePartnerMember.getCreateCollageUserId());
                     collageOrder = this.getCollageBaseHash(collageBaseHashKey);
-
-                    // 若拼单订单信息依然不存在，则返回错误提示【拼单订单信息不存在】，由前端根据场景处理（静默、提示拼单已取消）
-                    if (ObjectUtils.isEmpty(collageOrder)) {
-                        return CartResponseUtil.error(CollageOrderConstant.COLLAGE_ORDER_NOT_EXIST);
                 }
             }
+            if (ObjectUtils.isEmpty(collageOrder)) {
+                return CartResponseUtil.error(CollageOrderConstant.COLLAGE_ORDER_NOT_EXIST);
             }
-
             // 若拼单订单信息存在，则构造订单拼单对象并返回成功提示
             return CartResponseUtil.success(collageOrder);
         } catch (Exception e) {

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

@@ -7,18 +7,14 @@ import cn.freemud.entities.vo.CreateDeliveryVo;
 import cn.freemud.entities.vo.ProductInfo;
 import cn.freemud.enums.DeliveryChannelEnum;
 import cn.freemud.enums.OrderSourceType;
-import cn.freemud.enums.OrderType;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderRequestDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
-import com.freemud.sdk.api.assortment.order.enums.QueryOrderAccountType;
-import com.freemud.sdk.api.assortment.order.request.order.CreateOrderProductRequest;
 import com.freemud.sdk.api.assortment.order.request.order.OrderProductAddInfoDto;
 import com.freemud.sdk.api.assortment.order.request.order.OrderSpecialExtraAttrRequest;
-import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Component;
@@ -28,10 +24,9 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
-import static java.util.stream.Collectors.toList;
-
 @Component
 public class DeliveryAdapter {
 
@@ -187,6 +182,8 @@ public class DeliveryAdapter {
                 ProductInfo deliveryProductInfo = new ProductInfo();
                 deliveryProductInfo.setProductCode(productList.getProductId().substring(4));
                 String productName = StringUtils.isBlank(productList.getSpecificationName()) ? productList.getProductName() : productList.getSpecificationName();
+                String grilling = "";
+
                 OrderProductAddInfoDto extInfo = JSON.parseObject(productList.getExtInfo(), OrderProductAddInfoDto.class);
                 if(CollectionUtils.isNotEmpty(extInfo.getSpecialAttrs())) {
                     String attr = "";
@@ -203,9 +200,13 @@ public class DeliveryAdapter {
 
                 if(CollectionUtils.isNotEmpty(productList.getMaterialProduct())) {
                     for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean material : productList.getMaterialProduct()) {
-                        productName += "/"+material.getSpecificationName();
+                        grilling += material.getSpecificationName() + "/";
+                    }
                 }
+                if(grilling.length() > 0) {
+                    grilling = grilling.substring(0, grilling.length()-1);
                 }
+                deliveryProductInfo.setGrilling(grilling);
                 deliveryProductInfo.setProductName(productName);
                 deliveryProductInfo.setProductNumber(productList.getNumber());
                 deliveryProductInfo.setProductPrice(productList.getSalePrice().intValue());
@@ -218,11 +219,15 @@ public class DeliveryAdapter {
 
                 productInfos.add(deliveryProductInfo);
 
+                boolean isFeiChangDa = productList.getProductName().equalsIgnoreCase("啡常搭");
+
                 if(CollectionUtils.isNotEmpty(productList.getComboProduct())) {
                     productList.getComboProduct().forEach(comboProduct -> {
                         ProductInfo deliveryComboProductInfo = new ProductInfo();
                         deliveryComboProductInfo.setProductCode(comboProduct.getProductId().length()>4?comboProduct.getProductId().substring(4):comboProduct.getProductId());
                         String productNameCombo = StringUtils.isBlank(comboProduct.getSpecificationName()) ? comboProduct.getProductName() : comboProduct.getSpecificationName();
+                        String grillingCombo = "";
+
                         OrderProductAddInfoDto extInfoCombo = JSON.parseObject(comboProduct.getExtInfo(), OrderProductAddInfoDto.class);
                         if(CollectionUtils.isNotEmpty(extInfoCombo.getSpecialAttrs())) {
                             String attr = "";
@@ -239,14 +244,24 @@ public class DeliveryAdapter {
 
                         if(CollectionUtils.isNotEmpty(comboProduct.getMaterialProduct())) {
                             for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean material : comboProduct.getMaterialProduct()) {
-                                productNameCombo += "/"+material.getSpecificationName();
+                                grillingCombo += material.getSpecificationName() + "/";
                             }
                         }
+                        if(grillingCombo.length() > 0) {
+                            grillingCombo = grillingCombo.substring(0, grillingCombo.length()-1);
+                        }
+                        deliveryComboProductInfo.setGrilling(grillingCombo);
                         deliveryComboProductInfo.setProductName(productNameCombo);
                         deliveryComboProductInfo.setProductNumber(comboProduct.getNumber()/productList.getNumber());
+                        if(isFeiChangDa) {
                             deliveryComboProductInfo.setProductPrice(comboProduct.getSalePrice().intValue());
                             //餐道使用
                             deliveryComboProductInfo.setCumulatedTotal(comboProduct.getNumber() * comboProduct.getSalePrice().intValue());
+                        } else {
+                            deliveryComboProductInfo.setProductPrice(0);
+                            //餐道使用
+                            deliveryComboProductInfo.setCumulatedTotal(0);
+                        }
                         OrderProductAddInfoDto orderComboProductAddInfoDto = JSON.parseObject(comboProduct.getAddInfo(), OrderProductAddInfoDto.class);
                         deliveryComboProductInfo.setTaxId(StringUtils.isNotEmpty(orderComboProductAddInfoDto.getTaxId()) ? orderComboProductAddInfoDto.getTaxId() : "10");
                         deliveryComboProductInfo.setTaxRate(orderComboProductAddInfoDto.getTax() > 0 ? orderComboProductAddInfoDto.getTax() : 6);
@@ -278,7 +293,7 @@ public class DeliveryAdapter {
                     });
                 }
             });
-            deliveryOrderRequestDto.setProductTotal(productInfos.stream().mapToInt(t -> t.getCumulatedTotal()).sum());
+            deliveryOrderRequestDto.setProductTotal(productInfos.stream().mapToInt(t -> t.getCumulatedTotal()==null?0:t.getCumulatedTotal()).sum());
         }
 
 

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

@@ -1128,7 +1128,7 @@ public class OrderAdapter {
             responseVo.setPayStatusDesc(Optional.ofNullable(PayStatus.getByCode(ordersBean.getPayStatus()))
                     .map(PayStatus::getDesc).orElse(""));
             responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
-            if(mcCafePartnerId.equals(ordersBean.getCompanyId())) {
+            if(mcCafePartnerId.equals(ordersBean.getCompanyId()) && StringUtils.isNotBlank(responseVo.getPayVoucher())) {
                 responseVo.setPayVoucherBarCode(Base64.getEncoder().encodeToString(
                         BarcodeUtil.generateBarCode128(responseVo.getPayVoucher(),null,null, true, true)));
             }
@@ -2346,11 +2346,14 @@ public class OrderAdapter {
         if(cartGoodsDetailDto.getProductType() != null) {
             if(cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode()
                     || cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode()) {
-                createOrderProductDemoDto.setPrice(0l);
+//                createOrderProductDemoDto.setPrice(0l);
                 //套餐
                 List<CreateOrderProductRequest> comboProducts = new ArrayList<>();
                 cartGoodsDetailDto.getComboProducts().forEach(product -> {
                     CreateOrderProductRequest createOrderComboProduct = convent2MCCafeOrderProductDemo(product, product.getProductType());
+                    if(!product.getIsFixedProduct()) {
+                        createOrderProductDemoDto.setPrice(createOrderProductDemoDto.getPrice()+product.getOriginalPrice());
+                    }
                     comboProducts.add(createOrderComboProduct);
                     if(CollectionUtils.isNotEmpty(product.getMaterialList())) {
                         //加料商品

order-application-service/src/main/java/cn/freemud/entities/vo/ProductInfo.java

@@ -40,6 +40,11 @@ public class ProductInfo {
     private String productName;
 
     /**
+     * 特挑和加料信息
+     */
+    private String grilling;
+
+    /**
      * 商品数量
      * productNumber不能为空
      * productNumber不能小于1

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

@@ -981,7 +981,11 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             if (deliveryResponse == null || RESPONSE_SUCCESS_CODE != deliveryResponse.getCode() || deliveryResponse.getData() == null) {
                 String deliveryId = deliveryResponse != null && deliveryResponse.getData() != null ? deliveryResponse.getData().getDeliveryId() : "";
                 String operator =  "系统" ;
-                updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, operator);
+                String abnormalDesc = "配送异常";
+                if(null != deliveryResponse && StringUtils.isNotBlank(deliveryResponse.getMsg())) {
+                    abnormalDesc = deliveryResponse.getMsg();
+                }
+                updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, operator, abnormalDesc);
                 emailAlertService.sendEmailAlert("创建配送单失败", String.format("request:%s \r\nresponse:%s", JSONObject.toJSONString(createDeliveryVo), JSONObject.toJSONString(deliveryResponse)));
                 return sendPaySuccessNoticeMessage();
             } else {
@@ -1001,9 +1005,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
      * @param orderCode
      * @param deliveryId
      */
-    public void updateDeliveryAbnormal(String partnerId, String orderCode, String deliveryId, String operator) {
+    public void updateDeliveryAbnormal(String partnerId, String orderCode, String deliveryId, String operator, String abnormalDesc) {
         AssortmentUpdateDeliveryAbnormalRequest request = AssortmentUpdateDeliveryAbnormalRequest.builder()
-                .abnormalDesc("配送异常")
+                .abnormalDesc(abnormalDesc)
                 .deliveryId(deliveryId)
                 .orderCode(orderCode)
                 .partnerId(partnerId)

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

@@ -384,9 +384,13 @@ public class ShoppingCartConvertAdapter {
         cartGoods.setCreateTimeMili(cartGood.getCreateTimeMili());
         cartGoods.setSkuName(cartGood.getSkuName());
         cartGoods.setSkuName(cartGood.getSkuName());
-        cartGood.setClassificationId(cartGood.getClassificationId());
-        cartGood.setClassificationName(cartGood.getClassificationName());
+        cartGoods.setClassificationId(cartGood.getClassificationId());
+        cartGoods.setClassificationName(cartGood.getClassificationName());
         cartGoods.setActivityType(ActivityTypeEnum.TYPE_61.getCode());
+        cartGoods.setUserId(cartGood.getUserId());
+        cartGoods.setUserName(cartGood.getUserName());
+        cartGoods.setOpenId(cartGood.getOpenId());
+        cartGoods.setPhotoUrl(cartGood.getPhotoUrl());
         return cartGoods;
     }
 

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CollageOrderRequestVo.java

@@ -24,9 +24,6 @@ public class CollageOrderRequestVo {
     @NotEmpty(message = "sessionId不能为空")
     private String sessionId;
 
-    @ApiModelProperty(value = "当前操作人用户ID")
-    private String currentUserId;
-
     @ApiModelProperty(value = "拼单创建人用户ID")
     private String createCollageUserId;
 

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

@@ -58,18 +58,19 @@ public class CollageOrderServiceImpl implements CollageOrderService {
     @Override
     public BaseResponse queryCollageOrder(CollageOrderRequestVo request) {
         CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
-        // 查询时需传入拼单创建人的userId，若上送字段为空时，默认查询当前登录人自己的拼单信息
-        String currentUserId = StringUtils.isNotBlank(request.getCurrentUserId()) ? request.getCurrentUserId() : this.getUserIdBySessionId(request.getSessionId());
+        CustomerInfoVo userInfo = this.getUserInfo(request.getSessionId());
+        String currentUserId = userInfo.getMemberId();
+
+        // 当前登录人userId
         collageOrderDto.setCurrentUserId(currentUserId);
+
         // 若拼单发起人ID为空，则默认按当前用户查询
-        if (StringUtils.isEmpty(request.getCreateCollageUserId())) {
-            collageOrderDto.setCreateCollageUserId(currentUserId);
-        }
         BaseResponse<CollageOrder> queryCollageOrderResponse = this.collageOrderBaseService.queryCollageOrder(collageOrderDto);
         CollageOrder collageOrder = queryCollageOrderResponse.getResult();
 
-        // SDK查询订单返回非成功code或返回结果订单信息为空时，返回前端异常信息
-        Optional.ofNullable(queryCollageOrderResponse).filter(resp -> (ResponseResult.SUCCESS.getCode().equals(resp.getCode()) && !ObjectUtils.isEmpty(collageOrder))).orElseThrow(() -> new ServiceException(ResponseResult.COLLAGE_NOT_EXIST));
+        if (null == collageOrder) {
+            return ResponseUtil.error(ResponseResult.COLLAGE_NOT_EXIST);
+        }
 
         // 现在改为同时可查询自己发起以及参与的拼单所以查询到拼单信息后，后续查询需要使用拼单hash的三要素信息继续查询
         collageOrderDto.setPartnerId(collageOrder.getPartnerId());

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

@@ -720,6 +720,10 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
      */
     private void updatePackPrice(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ShoppingCartGoodsDto shoppingCartGoodsDto) {
         if (shoppingCartGoodsResponseVo != null && shoppingCartGoodsResponseVo.getProducts() != null && shoppingCartGoodsDto != null && shoppingCartGoodsDto.getProducts() != null) {
+            if (shoppingCartGoodsResponseVo.getNewPackAmount() == null || shoppingCartGoodsResponseVo.getNewPackAmount() == 0) {
+                // 当整单包装费为0时，不计算购物车行包装费
+                return;
+            }
             shoppingCartGoodsResponseVo.getProducts().stream().forEach(product -> {
                 shoppingCartGoodsDto.getProducts().stream().forEach(goods -> {
                     if (goods.getCartGoodsUid().equals(product.getCartGoodsUid())) {