Merge branch 'feature/20201124_xukang_麦咖啡p3v3'

# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

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());
-                        deliveryComboProductInfo.setProductPrice(comboProduct.getSalePrice().intValue());
-                        //餐道使用
-                        deliveryComboProductInfo.setCumulatedTotal(comboProduct.getNumber() * comboProduct.getSalePrice().intValue());
+                        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)