Merge remote-tracking branch 'origin/qa' into qa

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

@@ -239,14 +239,18 @@ public interface ShoppingCartBaseService {
                         cartGoodsStates.setPriceChanged(true);
                         checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
                         ValiadShopProductResult validaProduct = validateResult.getFailureList().get(i);
-                        checkCartRequest.getCartGoodsList().forEach(cartGoods -> {
-                            String spuName = cartGoods.getSkuId().equals(validaProduct.getSkuId()) ? cartGoods.getSpuName() : "";
+                        String spuName = StringUtils.isEmpty(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg()) ? "" : checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg();
+                        for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
+                            spuName = spuName.concat(cartGoods.getSkuId().equals(validaProduct.getSkuId()) ? cartGoods.getSpuName() : "").concat(",");
                             if (PRODUCT_PRICE_CHANGE == validaProduct.getCode()) {
-                                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(CART_PRODUCT_PRICE_CHANGE.replace("$spuName", spuName));
                                 List<ProductBeanDTO> productList = validateResult.getFailureList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
                                 shoppingCartAdapter.updateCartGoodsInfoNew(cartGoods, productList);
                             }
-                        });
+                        }
+                        if (spuName.split(",").length > 1){
+                            spuName.substring(0,spuName.length()-1).concat("等");
+                        }
+                        checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(CART_PRODUCT_PRICE_CHANGE.replace("$spuName", spuName.replace("【","").replace("】","")));
                     }
                 }
                 setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.SHOPPING_CART_GOODS_CHANGE);
@@ -990,5 +994,4 @@ public interface ShoppingCartBaseService {
         }
         return null;
     }
-
 }

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

@@ -209,7 +209,8 @@ public class DeliveryAdapter {
                         deliveryComboProductInfo.setTaxId(StringUtils.isNotEmpty(orderComboProductAddInfoDto.getTaxId()) ? orderComboProductAddInfoDto.getTaxId() : "10");
                         deliveryComboProductInfo.setTaxRate(orderComboProductAddInfoDto.getTax() > 0 ? orderComboProductAddInfoDto.getTax() : 6);
 
-                        deliveryComboProductInfo.setParentCode(Long.valueOf(comboProduct.getParentProductId().split("_")[0]));
+                        deliveryComboProductInfo.setParentCode(Long.valueOf(comboProduct.getParentProductId().replace("_", "")));
+                        deliveryProductInfo.setProductCode(deliveryComboProductInfo.getParentCode()+"");
 
                         productInfos.add(deliveryComboProductInfo);
                     });

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

@@ -97,12 +97,6 @@ import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
 
 @Component
 public class OrderAdapter {
-
-    public final static String TAKECODEKEY = "takecode";
-    public static final String REDIS_KEY_SEP = ":";
-    public static final String numberChar = "0123456789";
-    public static final String numberCharWithoutZero = "12345";
-
     private static FastDateFormat yyyyMMddHHmmss = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
 
     private static String SPMCHID = "1237482502";
@@ -3314,79 +3308,6 @@ public class OrderAdapter {
         return ebCode;
     }
 
-    /**
-     * 生成取餐码
-     * @param partnerId 商户ID
-     * @param storeId 门店ID
-     * @return
-     */
-    public String generateTackCode(String partnerId, String storeId){
-        String pickUpGoodsNo = generateNumber(6);
-        String key = this.getOrderTackCodeKey(partnerId,storeId);
-        if(!redisTemplate.opsForHash().hasKey(key,storeId+pickUpGoodsNo)) {
-            redisTemplate.opsForHash().put(key,storeId+pickUpGoodsNo,pickUpGoodsNo);
-            redisTemplate.expire(key,getSecondsNextEarlyMorning(), TimeUnit.SECONDS);
-        }else{
-            generateTackCode(partnerId, storeId);
-        }
-        return pickUpGoodsNo;
-    }
-
-    /**
-     * 获取取餐码key
-     * @param partnerId
-     * @return
-     */
-    public String getOrderTackCodeKey(String partnerId,String storeId){
-        Date currentDay = new Date();
-        String todayStr = formatDate(currentDay);
-        StringBuilder key = new StringBuilder(TAKECODEKEY).append(REDIS_KEY_SEP)
-                .append(partnerId)
-                .append(REDIS_KEY_SEP)
-                .append(storeId)
-                .append(REDIS_KEY_SEP)
-                .append(todayStr);
-        return key.toString();
-    }
-
-    public static SimpleDateFormat defaultDateFormater = new SimpleDateFormat("yyyy-MM-dd");
-
-    private  String formatDate(Date date){
-        return defaultDateFormater.format(date);
-    }
-
-    /**
-     * 返回一个定长的随机字符串(只包含大小写字母、数字)
-     *
-     * @param length
-     *            随机字符串长度
-     * @return 随机字符串
-     */
-    public static String generateNumber(int length) {
-        StringBuffer sb = new StringBuffer();
-        Random random = new Random();
-        for (int i = 0; i < length; i++) {
-            if (i == 0){
-                sb.append(numberCharWithoutZero.charAt(random.nextInt(numberCharWithoutZero.length())));
-            }else {
-                sb.append(numberChar.charAt(random.nextInt(numberChar.length())));
-            }
-        }
-        return sb.toString();
-    }
-
-
-
-    private Long getSecondsNextEarlyMorning(){
-        Calendar cal = Calendar.getInstance();
-        cal.add(Calendar.DAY_OF_YEAR, 1);
-        cal.set(Calendar.HOUR_OF_DAY, 0);
-        cal.set(Calendar.SECOND, 0);
-        cal.set(Calendar.MINUTE, 0);
-        cal.set(Calendar.MILLISECOND, 0);
-        return (cal.getTimeInMillis() - System.currentTimeMillis()) / 1000;
-    }
-
     public List<AssortmentOpenPlatformPartnerWxappConfig> cacheSelectDefaultPage(String wxAppId, String type) {
         if (!StringUtils.isEmpty(wxAppId) && !StringUtils.isEmpty(type)) {
             String hashKey = "ecology:kgd:wxappconfig:open_platform_partner_wxapp_config:appkey_" + wxAppId;

shopping-cart-application-service/pom.xml

@@ -296,6 +296,12 @@
             <groupId>org.apache.skywalking</groupId>
             <artifactId>apm-toolkit-logback-1.x</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.freemud</groupId>
+            <artifactId>assortment-shoppingcart-sdk</artifactId>
+            <version>1.1.5.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
     <build>