Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop

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

@@ -672,19 +672,11 @@ public class CouponAdapter {
                         }
                         MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
                         mcCafeProductRedeemVo.setPid(pid);
-                        String extInfo = null;
-                        if(CollectionUtils.isNotEmpty(productBean.getDiscountList())) {
-                            for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean.ProductDiscount discount : productBean.getDiscountList()) {
-                                if(discount.getDiscountId().equals(accountBean.getAccountId())) {
-                                    extInfo = discount.getAddInfo();
-                                    break;
-                                }
-                            }
-                        }
-                        Integer extendType = StringUtils.isBlank(extInfo)?null: JSON.parseObject(accountBean.getAddInfo()).getInteger("extendType");
+                        String extInfo = productDiscount.getAddInfo();
+                        Integer extendType = StringUtils.isBlank(extInfo)?null: JSON.parseObject(extInfo).getInteger("extendType");
                         if(extendType != null && extendType == 4) {
-                            mcCafeProductRedeemVo.setKeyProductCode(JSON.parseObject(accountBean.getAddInfo()).getString("tenderId"));
-                            mcCafeProductRedeemVo.setCustomer_code(JSON.parseObject(accountBean.getAddInfo()).getString("tenderId"));
+                            mcCafeProductRedeemVo.setKeyProductCode(JSON.parseObject(extInfo).getString("tenderId"));
+                            mcCafeProductRedeemVo.setCustomer_code(JSON.parseObject(extInfo).getString("tenderId"));
                         } else {
                             mcCafeProductRedeemVo.setKeyProductCode(productBean.getCustomerCode());
                             mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());

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

@@ -1934,15 +1934,21 @@ public class OrderAdapter {
             String attr = "";
             for (OrderSpecialExtraAttrRequest special : extInfo.getSpecialAttrs()) {
                 if(special.getAttributeName().indexOf("冰") >= 0) {
-                    attr += special.getAttributeName()+",";
+                    attr = special.getAttributeName();
+                    break;
                 }
             }
             if(attr.length() > 0) {
-                attr = attr.substring(0, attr.length()-1);
                 productName += "("+attr+")";
             }
         }
 
+        if(CollectionUtils.isNotEmpty(productBean.getMaterialProduct())) {
+            for (QueryOrdersResponse.DataBean.OrderBean.ProductBean material : productBean.getMaterialProduct()) {
+                productName += "/"+material.getSpecificationName();
+            }
+        }
+
         productVo.setName(productName);
         productVo.setSpuName(productBean.getProductName());
         productVo.setPicture(productBean.getPicture());

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

@@ -162,6 +162,8 @@ public class CouponClientServiceImpl implements CouponClientService {
 
     @Override
     public List<CouponRedeemResponse> redeemBatch(QueryOrdersResponseDto.DataBean.OrderBean orderBean) {
+        System.out.println("=======================================================================");
+        System.out.println(JSON.toJSONString(orderBean));
         if (null == orderBean || CollectionUtils.isEmpty(orderBean.getAccountList())) {
             return null;
         }

order-management/src/main/java/cn/freemud/management/adapter/McCafeCouponAdapter.java

@@ -91,20 +91,11 @@ public class McCafeCouponAdapter {
                         }
                         MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
                         mcCafeProductRedeemVo.setPid(pid);
-
-                        String extInfo = null;
-                        if(CollectionUtils.isNotEmpty(productBean.getDiscountList())) {
-                            for (QueryOrdersResponse.DataBean.OrderBean.ProductBean.ProductDiscount discount : productBean.getDiscountList()) {
-                                if(discount.getDiscountId().equals(accountBean.getAccountId())) {
-                                    extInfo = discount.getAddInfo();
-                                    break;
-                                }
-                            }
-                        }
-                        Integer extendType = StringUtils.isBlank(extInfo)?null: JSON.parseObject(accountBean.getAddInfo()).getInteger("extendType");
+                        String extInfo = productDiscount.getAddInfo();
+                        Integer extendType = StringUtils.isBlank(extInfo)?null: JSON.parseObject(extInfo).getInteger("extendType");
                         if(extendType != null && extendType == 4) {
-                            mcCafeProductRedeemVo.setKeyProductCode(JSON.parseObject(accountBean.getAddInfo()).getString("tenderId"));
-                            mcCafeProductRedeemVo.setCustomer_code(JSON.parseObject(accountBean.getAddInfo()).getString("tenderId"));
+                            mcCafeProductRedeemVo.setKeyProductCode(JSON.parseObject(extInfo).getString("tenderId"));
+                            mcCafeProductRedeemVo.setCustomer_code(JSON.parseObject(extInfo).getString("tenderId"));
                         } else {
                             mcCafeProductRedeemVo.setKeyProductCode(productBean.getCustomerCode());
                             mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());