Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

.gitignore

@@ -18,3 +18,5 @@ push-order-service/push-order-service.iml
 push-order-service/target/
 shopping-cart-application-service/shopping-cart-application-service.iml
 shopping-cart-application-service/target/
+order-management/order-application-service.iml
+order-management/target/
\ No newline at end of file

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.2.4.RELEASE</version>
+    <version>1.2.6.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.1.8.RELEASE</version>
+            <version>1.1.9.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -19,4 +19,6 @@
 | 1.1.7-SNAPSHOT| 预约单支付成功接口增加预约任务  | wuping | 2020-03-10 |
 | 1.1.8-SNAPSHOT| 预约单接单接口增加预约任务  | wuping | 2020-03-17 |
 | 1.2.3.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
-| 1.2.4.RELEASE | 紧急需求 增加骑手电话 | 海波 | 2020-03-19 |
\ No newline at end of file
+| 1.2.4.RELEASE | 紧急需求 增加骑手电话 | 海波 | 2020-03-19 |
+| 1.2.5.RELEASE | 满额减配送费 | dingkai | 2020-03-26 |
+| 1.2.5.RELEASE | 满额减配送费 | 海波 | 2020-03-26 |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2729,6 +2729,9 @@ public class OrderSdkAdapter {
             case 208:
                 name = OrderSettlementType.DISCOUNT_COUPON.getName();
                 break;
+            case 1014:
+                name = OrderSettlementType.FULL_DISTRIBUTION_FEE.getName();
+                break;
             default:
                 break;
         }

assortment-shoppingcart-sdk/pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.7.7-SNAPSHOT</version>
+            <version>2.8.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -59,7 +59,9 @@ public class ShoppingCartAdapter {
             ValidateShopProductType productType = new ValidateShopProductType();
             productType.setSpuId(cartGoods.getSpuId());
             productType.setSkuId(ObjectUtils.equals(GoodsTypeEnum.SKU_GOODS.getGoodsType(), cartGoods.getGoodsType()) ? cartGoods.getSkuId() : cartGoods.getSpuId());
-            productType.setPrice(cartGoods.getOriginalPrice() == null ? 0 : cartGoods.getOriginalPrice().intValue());
+            // 应产品要求
+            // 普通商品，取商品的finalePrice(普通商品售价);套餐商品，取originalPrice(套餐价格)
+            productType.setPrice(cartGoods.getFinalPrice() == null ? 0 : cartGoods.getFinalPrice().intValue());
             productType.setValidatePrice(productType.getPrice() == 0 ? 0 : 1);
             productType.setValidateAttribute(1);
             productType.setValidateStatuses(Arrays.asList(2));
@@ -97,6 +99,7 @@ public class ShoppingCartAdapter {
                 validateSkuProductType.setMarkUpPrice(comboxGoods.getFinalPrice() == null ? 0 : comboxGoods.getFinalPrice().intValue());
                 validateSkuProductType.setQty(comboxGoods.getQty());
                 validateSkuProductType.setAttributeList(getAttributes(comboxGoods.getExtra()));
+                validateSkuProductType.setProductGroupId(comboxGoods.getProductGroupId());
                 result.add(validateSkuProductType);
             }
         }

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

@@ -234,6 +234,10 @@ public class CartGoods {
          */
         private String unit;
         /**
+         * 商品组Id
+         */
+        private Long productGroupId;
+        /**
          * 配料或属性
          */
         private List<CartGoodsExtra> extra;

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.1.8.RELEASE</version>
+    <version>1.1.9.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -12,4 +12,5 @@
 | 1.1.6.RELEASE | 升级RELEASE | wuping | 2020-03-04 |
 | 1.1.7-SNAPSHOT | 预约单支付成功接口增加预约任务 | wuping | 2020-03-10 |
 | 1.1.8-SNAPSHOT | 预约单接单接口增加预约任务 | wuping | 2020-03-17 |
-| 1.1.8.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
\ No newline at end of file
+| 1.1.8.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
+| 1.1.9.RELEASE | 满额减配送费RELEASE | dingkai | 2020-03-26 |
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderSettlementType.java

@@ -40,8 +40,8 @@ public enum OrderSettlementType {
     DISCOUNT_FEE(205, "优惠总金额"),
     ITEM_SPECIAL_PRICE(206, "单品特价"),
     ONE_BY_ONE(207, "买一送一"),
-    DISCOUNT_COUPON(208, "折扣券")
-
+    DISCOUNT_COUPON(208, "折扣券"),
+    FULL_DISTRIBUTION_FEE(1014, "满减配送费"),
     ;
     private int index;
     private String name;

shopping-cart-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.7.7-SNAPSHOT</version>
+            <version>2.8.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -363,6 +363,7 @@ public class ShoppingCartConvertAdapter {
                 productCombox.setSkuId(vo.getSkuId());
                 productCombox.setQty(vo.getQty());
                 productCombox.setExtra(vo.getExtra());
+                productCombox.setProductGroupId(StringUtils.isEmpty(vo.getProductGroupId())?null: Long.parseLong(vo.getProductGroupId()));
                 productGroupList.add(productCombox);
             }
         }

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

@@ -18,7 +18,7 @@ public class ApplicationConstant {
     
     public final static String BURYINGPOINT = "POINT";
 
-    public final static String DELIVERY_DISCOUNT_DESC1="订单满%d元 减%d配送费";
-    public final static String DELIVERY_DISCOUNT_DESC2="订单满%d元 免配送费";
+    public final static String DELIVERY_DISCOUNT_DESC1="订单满%s元减%s元配送费";
+    public final static String DELIVERY_DISCOUNT_DESC2="订单满%s元免配送费";
     public final static String DELIVERY_DISCOUNT_DESC3="另需配送费%s元";
 }

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

@@ -242,6 +242,10 @@ public class CartGoods {
          * 第三方商品编号
          */
         private String customerCode;
+        /**
+         * 商品组Id
+         */
+        private Long productGroupId;
 
         @Override
         public int hashCode() {

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

@@ -22,6 +22,10 @@ public class ComboxGoodsRequestVo {
     private String skuId;
     private Integer qty;
     /**
+     * 商品组Id
+     */
+    private String productGroupId;
+    /**
      * 商品额外的属性
      */
     List<CartGoods.CartGoodsExtra> extra;

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

@@ -45,10 +45,6 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
      * 总折扣价
      */
     private Long totalDiscountAmount;
-    /**
-     * 包装费
-     */
-    private Long packAmount;
 
     /**
      * 新包装费（该字段给新版本前端展示，使其好计算）

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

@@ -106,8 +106,8 @@ public class BuySendPromotionService implements IPromotionService {
         activityTip.setActivitySpuIds(activitySpuIds);
         // 当maxNum>=minNum，在加入买一赠一商品时提示“您参加的买赠优惠最多赠送N件哦～”
         shoppingCartGoodsResponseVo.setBuyOneGetActivity(activityTip);
-        Long packAmount = Objects.isNull(shoppingCartGoodsResponseVo.getPackAmount()) ? 0L : shoppingCartGoodsResponseVo.getPackAmount();
-        shoppingCartGoodsResponseVo.setPackAmount(givePackAmount + packAmount);
+        Long packAmount = Objects.isNull(shoppingCartGoodsResponseVo.getNewPackAmount()) ? 0L : shoppingCartGoodsResponseVo.getNewPackAmount();
+        shoppingCartGoodsResponseVo.setNewPackAmount(givePackAmount + packAmount);
         Long originalTotalAmount = Objects.isNull(shoppingCartGoodsResponseVo.getOriginalTotalAmount()) ? 0L : shoppingCartGoodsResponseVo.getOriginalTotalAmount();
         shoppingCartGoodsResponseVo.setOriginalTotalAmount(originalTotalAmount + giveTotalAmount);
         Long totalDiscountAmount = Objects.isNull(shoppingCartGoodsResponseVo.getTotalDiscountAmount()) ? 0L : shoppingCartGoodsResponseVo.getTotalDiscountAmount();

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

@@ -65,7 +65,6 @@ public class DefaultPromotionService implements IPromotionService {
         }
         shoppingCartGoodsResponseVo.setOriginalTotalAmount(calculationDiscountResult == null ? totalOriginalAmount : calculationDiscountResult.getOriginalTotalAmount());
         shoppingCartGoodsResponseVo.setTotalAmount(calculationDiscountResult == null ? totalAmount : calculationDiscountResult.getTotalAmount());
-        shoppingCartGoodsResponseVo.setPackAmount(totalPackgeAmount);
         shoppingCartGoodsResponseVo.setNewPackAmount(totalPackgeAmount);
         shoppingCartGoodsResponseVo.setTotalDiscountAmount(calculationDiscountResult == null ? 0L : calculationDiscountResult.getTotalDiscountAmount());
     }
@@ -80,7 +79,7 @@ public class DefaultPromotionService implements IPromotionService {
         shoppingCartGoodsDto.setOriginalTotalAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount());
         shoppingCartGoodsDto.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount());
         shoppingCartGoodsDto.setTotalDiscountAmount(shoppingCartGoodsResponseVo.getTotalDiscountAmount());
-        shoppingCartGoodsDto.setPackageAmount(shoppingCartGoodsResponseVo.getPackAmount());
+        shoppingCartGoodsDto.setPackageAmount(shoppingCartGoodsResponseVo.getNewPackAmount());
         List<CartGoods> cartGoodsList = shoppingCartGoodsResponseVo.getProducts();
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods> apportionGoodsList =
                 calculationDiscountResult == null ? new ArrayList<>() : calculationDiscountResult.getApportionGoods();

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

@@ -1006,7 +1006,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
          */
 
         if(BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
-
+            DecimalFormat df = new DecimalFormat("###.##");
             List<ActivityTypeEnum> activityTypeEnums = new LinkedList<>();
             activityTypeEnums.add(ActivityTypeEnum.TYPE_14);
 
@@ -1032,10 +1032,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             if(discount!=null){
                 if(beanDto.getBenefitType() == 1){
                     String desc = DELIVERY_DISCOUNT_DESC2;
-                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ));
+                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(beanDto.getThresholdAmount().doubleValue() /100) ));
                 }else{
                     String desc = DELIVERY_DISCOUNT_DESC1;
-                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ,beanDto.getDiscountAmount() / 100));
+                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(beanDto.getThresholdAmount().doubleValue() /100) ,df.format(beanDto.getDiscountAmount().doubleValue() / 100)));
                 }
                 shoppingCartGoodsResponseVo.setDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
                 shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult.getDistributionFee());
@@ -1047,10 +1047,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
                     if(beanDto.getBenefitType() == 1){
                         String desc = DELIVERY_DISCOUNT_DESC2;
-                        shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ));
+                        shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(beanDto.getThresholdAmount().doubleValue() /100) ));
                     }else{
                         String desc = DELIVERY_DISCOUNT_DESC1;
-                        shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ,beanDto.getDiscountAmount() / 100));
+                        shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(beanDto.getThresholdAmount().doubleValue() /100 ),df.format(beanDto.getDiscountAmount().doubleValue() / 100)));
                     }
 
                     shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
@@ -1058,7 +1058,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
 
                 }else{
-                    DecimalFormat df = new DecimalFormat("###.##");
+                    //DecimalFormat df = new DecimalFormat("###.##");
                     String desc = DELIVERY_DISCOUNT_DESC3;
                     shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(deliveryAmount.doubleValue() / 100)));
                     shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
@@ -1268,26 +1268,22 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             }
 
         }
-        // 给前端展示
-        shoppingCartGoodsResponseVo.setNewPackAmount(shoppingCartGoodsResponseVo.getPackAmount());
-
         // 更新和添加商品时不需要包装费
         if (ShoppingCartConstant.ADD_AND_UPDATE.equals(opt)) {
-            shoppingCartGoodsResponseVo.setPackAmount(null);
+            shoppingCartGoodsResponseVo.setNewPackAmount(null);
             return;
         }
-
         //==========================  购物车查询特有逻辑  =================================
         // 到店自取包装费设为null,外卖要计算包装费，flag为1表示去结算
         // 兼容老版本判断null
         if (Objects.equals(shoppingCartInfoRequestVo.getOrderType(), CreateOrderType.COLLECT_GOODS.getCode())
                 && (Objects.equals(shoppingCartInfoRequestVo.getReachStoreType(), null)
                 || Objects.equals(shoppingCartInfoRequestVo.getReachStoreType(), OrderType.EAT_IN.getCode()))) {
-            shoppingCartGoodsResponseVo.setPackAmount(null);
+            shoppingCartGoodsResponseVo.setNewPackAmount(null);
         } else if ((Objects.equals(shoppingCartInfoRequestVo.getOrderType(), CreateOrderType.TAKE_OUT.getCode())
                 || Objects.equals(shoppingCartInfoRequestVo.getReachStoreType(), OrderType.COLLECT_GOODS.getCode()))
                 && Objects.equals(shoppingCartInfoRequestVo.getFlag(), CouponFlag.YES.getCode())) {
-            Long packAmount = shoppingCartGoodsResponseVo.getPackAmount() == null ? 0 : shoppingCartGoodsResponseVo.getPackAmount();
+            Long packAmount = shoppingCartGoodsResponseVo.getNewPackAmount() == null ? 0 : shoppingCartGoodsResponseVo.getNewPackAmount();
             Long originalTotalAmount = shoppingCartGoodsResponseVo.getOriginalTotalAmount() + packAmount;
             Long totalAmount = shoppingCartGoodsResponseVo.getTotalAmount() + packAmount;
             shoppingCartGoodsResponseVo.setOriginalTotalAmount(originalTotalAmount);
@@ -1489,9 +1485,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     }
 
     private Long calculateDeliveryAmount(String receiveId,String partnerId,String storeId,String wxappid){
-        Long deliveryAmount=0l;
+        Long deliveryAmount = 0l;
         if(receiveId==null) {
-
         }else{
             deliveryAmount = Long.parseLong(getDeliveryAmount(receiveId,partnerId,storeId).toString());
         }