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

 Conflicts:
	assortment-ordercenter-sdk/pom.xml
	order-application-service/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.4.38-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -61,7 +61,7 @@
         <dependency>
             <artifactId>promotioncenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>2.3.RELEASE</version>
+            <version>2.6.5.SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -1604,6 +1604,9 @@ public class OrderSdkAdapter {
         activityUpdateStockRequest.setPartnerCode(orderBean.getCompanyId());
         activityUpdateStockRequest.setStoreId(orderBean.getShopId());
         activityUpdateStockRequest.setVer("1");
+        // add by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
+        activityUpdateStockRequest.setUserId(orderBean.getUserId());
+        activityUpdateStockRequest.setOrderCreateTime(DateUtil.getCurrentDate(DateUtil.FORMAT_yyyyMMdd_date));
         return activityUpdateStockRequest;
     }
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/ResponseResult.java

@@ -95,6 +95,7 @@ public enum ResponseResult {
     ORDER_CREATE_FORMID_ISNULL("45018", "0元购formId不能为空"),
     ORDER_GET_PAY_EB_CODE_ERROR("45019", "没有配置支付payEbCode"),
     ORDER_WXAPP_NOT_ENABLE_COLLECT_GOODS("45020","小程序未开通到店自取"),
+    ORDER_PARTNER_REFUND_COUNT_ERR("45021","商户退款数量查询失败"),
 
     /**
      * 优惠券活动

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/QueryStoreRefundCountRequest.java

+package com.freemud.sdk.api.assortment.order.request.order;
+
+import com.freemud.sdk.api.assortment.order.config.BaseConfig;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: QueryPartnerRefundCountRequest
+ * @Package com.freemud.sdk.api.assortment.order.request.order
+ * @Description:
+ * @author: pengfei.liu
+ * @date: 2020/10/26
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目的
+ */
+@Data
+public class QueryStoreRefundCountRequest extends BaseConfig {
+
+    /**
+     * 商户编号
+     */
+    private String partnerId;
+
+    /**
+     * 开始时间戳（单位：秒）
+     */
+    private Long startTimestamp;
+
+    /**
+     * 结束时间戳（单位：秒）
+     */
+    private Long endTimestamp;
+
+    /**
+     * 门店id
+     */
+    List<String> storeIds;
+}

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryPartnerRefundCountResponse.java

+package com.freemud.sdk.api.assortment.order.response.order;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: QueryPartnerRefundCountResponse
+ * @Package com.freemud.sdk.api.assortment.order.response.order
+ * @Description:
+ * @author: pegnfei.liu
+ * @date: 2020/10/27
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目的
+ */
+@Data
+public class QueryPartnerRefundCountResponse {
+
+
+    private String errcode;
+    private String errmsg;
+    private PartnerRefundCount data;
+
+
+    @NoArgsConstructor
+    @Data
+    public static class PartnerRefundCount {
+
+        /**
+         * 商户编号
+         */
+        private String partnerId;
+
+        /**
+         * 门店退款数量
+         */
+        List<StoreRefundCount> storeRefundCount;
+
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class StoreRefundCount {
+
+        /**
+         * 门店编号
+         */
+        private String storeId;
+
+        /**
+         * 退款订单数量
+         */
+        private Long count;
+
+    }
+
+}

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/OrderCenterSdkService.java

@@ -344,4 +344,11 @@ public interface OrderCenterSdkService {
      */
     BaseOrderResponse updatePickUpGoodNo(OrderModifyRelatingCodeReq orderModifyRelatingCodeReq, String trackingNo);
 
+    /**
+     * 查询商户每个门店未退款的订单数量<br/>
+     * @param request
+     * @return
+     */
+    QueryPartnerRefundCountResponse queryRefundCount(QueryStoreRefundCountRequest request);
+
 }

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.20-SNAPSHOT</version>
+            <version>2.0.21-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -60,7 +60,7 @@
         <dependency>
             <artifactId>promotioncenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>2.3.RELEASE</version>
+            <version>2.6.5.SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>

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

@@ -275,6 +275,9 @@ public class OrderAdapter {
         }
         createOrderDto.setAccounts(CollectionUtils.isNotEmpty(orderAccountDtos) ? orderAccountDtos : Collections.emptyList());
 
+        // update by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
+        ActivityUpdateStockRequest activityUpdateStockRequest = this.initActivityUpdateStockRequest(activityDiscountsDtos);
+
         //设置库存扣减
         if (CollectionUtils.isNotEmpty(shoppingCartGoodsDto.getStocks())) {
             List<ActivityUpdateStockRequest.StockBeanDto> stocks = new ArrayList<>();
@@ -296,10 +299,10 @@ public class OrderAdapter {
                 }
                 stocks.add(stockBeanDto);
             }
-            ActivityUpdateStockRequest activityUpdateStockRequest = new ActivityUpdateStockRequest();
+
             activityUpdateStockRequest.setStock(stocks);
-            createOrderDto.setActivityUpdateStockRequest(activityUpdateStockRequest);
         }
+        createOrderDto.setActivityUpdateStockRequest(activityUpdateStockRequest);
         createOrderDto.setPayChannelType(createOrderVo.getPayChannelType());
 
         // createOrderDto.setOtherInfo(getOrderOtherInfo(shoppingCartGoodsDto));
@@ -758,6 +761,10 @@ public class OrderAdapter {
             orderAccountDtos.add(createOrderAccountDto);
         }
         productOrderInfo.setAccounts(CollectionUtils.isNotEmpty(orderAccountDtos) ? orderAccountDtos : Collections.emptyList());
+
+        // update by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
+        ActivityUpdateStockRequest activityUpdateStockRequest = this.initActivityUpdateStockRequest(activityDiscountsDtos);
+
         //设置库存扣减
         if (CollectionUtils.isNotEmpty(shoppingCartGoodsDto.getStocks())) {
             List<ActivityUpdateStockRequest.StockBeanDto> stocks = new ArrayList<>();
@@ -779,10 +786,9 @@ public class OrderAdapter {
                 }
                 stocks.add(stockBeanDto);
             }
-            ActivityUpdateStockRequest activityUpdateStockRequest = new ActivityUpdateStockRequest();
             activityUpdateStockRequest.setStock(stocks);
-            productOrderInfo.setActivityUpdateStockRequest(activityUpdateStockRequest);
         }
+        productOrderInfo.setActivityUpdateStockRequest(activityUpdateStockRequest);
         return productOrderInfo;
     }
 
@@ -3068,6 +3074,8 @@ public class OrderAdapter {
 //        }
 //        createOrderDto.setAccounts(CollectionUtils.isNotEmpty(orderAccountDtos) ? orderAccountDtos : Collections.emptyList());
 
+        // update by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
+        ActivityUpdateStockRequest activityUpdateStockRequest = this.initActivityUpdateStockRequest(activityDiscountsDtos);
 
         //设置库存扣减
         if (shoppingCartGoodsResponse != null && CollectionUtils.isNotEmpty(shoppingCartGoodsResponse.getStocks())) {
@@ -3090,10 +3098,9 @@ public class OrderAdapter {
                 }
                 stocks.add(stockBeanDto);
             }
-            ActivityUpdateStockRequest activityUpdateStockRequest = new ActivityUpdateStockRequest();
             activityUpdateStockRequest.setStock(stocks);
-            sdkUpdateOrderProductInfoRequest.setActivityUpdateStockRequest(activityUpdateStockRequest);
         }
+        sdkUpdateOrderProductInfoRequest.setActivityUpdateStockRequest(activityUpdateStockRequest);
         return sdkUpdateOrderProductInfoRequest;
     }
 
@@ -3450,4 +3457,22 @@ public class OrderAdapter {
         deleteOrderDto.setOrderId(oId);
         return deleteOrderDto;
     }
+
+    /**
+     * 初始化扣减活动库存请求对象
+     * add by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
+     * @return
+     */
+    private ActivityUpdateStockRequest initActivityUpdateStockRequest(List<ActivityDiscountsDto> activityDiscountsDtos) {
+        // 原逻辑只检测扣减库存不为空时调用，现改为扣减库存不为空或参加活动不为空时调用
+        ActivityUpdateStockRequest activityUpdateStockRequest = new ActivityUpdateStockRequest();
+        List<String> activityList = new ArrayList<>();
+        // 只记录订单级别的活动ID
+        if (CollectionUtils.isNotEmpty(activityDiscountsDtos)) {
+            activityList.addAll(activityDiscountsDtos.stream().filter(ad -> StringUtils.isNotBlank(ad.getActivityCode())).map(ActivityDiscountsDto::getActivityCode).distinct().collect(Collectors.toList()));
+        }
+        //设置活动编号
+        activityUpdateStockRequest.setActivityList(CollectionUtils.isNotEmpty(activityList) ? activityList : null);
+        return activityUpdateStockRequest;
+    }
 }

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

@@ -1615,10 +1615,6 @@ public class OrderServiceImpl implements Orderservice {
                     && !ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())) {
                 isRefundDeliveryFee = false;
             }
-            if(PayChannel.SVC.getCode().equals(orderBean.getPayChannel())){
-                isRefundDeliveryFee = true;
-            }
-
             // 未接单
             if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
                 //商家未接单逻辑处理    1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.4.38-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/AfterSalesOrderResp.java

@@ -78,4 +78,9 @@ public class AfterSalesOrderResp {
     private Integer weight;
     //售后单阶段类型 1:售前 2:售中 3:售后
     private Byte afterSalesStageType;
+
+    /**
+     * 门店ID
+     */
+    private String storeId;
 }

shopping-cart-application-service/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-shoppingcart-sdk</artifactId>
-            <version>1.9.12-SNAPSHOT</version>
+            <version>2.0.1-SNAPSHOT</version>
         </dependency>
         <!--   再来一单查询订单信息  -->
         <dependency>

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

@@ -172,7 +172,12 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
 
         //商品券已添加情况校验
-        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode,goodsId);
+        List<CartGoods.MaterialGoods> productMaterialList =new ArrayList<>();
+        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode,goodsId, productMaterialList);
+        if (CollectionUtils.isNotEmpty(productMaterialList)){
+            // 复制加料信息
+            addShoppingCartGoodsRequestVo.setProductMaterialList(adapterProductMateria(productMaterialList));
+        }
         CartGoods addCartGoods = convent2CartGoods(addShoppingCartGoodsRequestVo, goodsId ,vo);
         setClassificationAndPrice(addCartGoods, productBeanListSpuClass);
         if(StringUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getGroupName())) {
@@ -201,6 +206,19 @@ public class ShoppingCartMCoffeeServiceImpl {
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }
 
+
+    private List<MaterialRequestVo> adapterProductMateria(List<CartGoods.MaterialGoods> productMaterialList){
+        List<MaterialRequestVo> materialRequestVos = new ArrayList<>();
+        for (CartGoods.MaterialGoods materialGoods: productMaterialList) {
+            MaterialRequestVo vo =new MaterialRequestVo();
+            vo.setSpuId(materialGoods.getSpuId());
+            vo.setCustomerCode(materialGoods.getCustomerCode());
+            vo.setGroupId(materialGoods.getGroupId());
+            materialRequestVos.add(vo);
+        }
+        return materialRequestVos;
+    }
+
     private MCoffeeProductIdsVo validCoupon(String partnerId, String storeId, String spuId, List<Long> productIds, String menuType) {
         CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, spuId.substring(CommonsConstant.COUPON_PREFIX.length()), menuType);
         CouponService couponService = SDKCommonBaseContextWare.getBean(CouponService.class);
@@ -218,7 +236,7 @@ public class ShoppingCartMCoffeeServiceImpl {
     }
 
 
-    private List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> checkGoodsCoupon(List<CartGoods> oldCartGoodsList, Integer operationType, String couponCode,String goodsId) {
+    private List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> checkGoodsCoupon(List<CartGoods> oldCartGoodsList, Integer operationType, String couponCode,String goodsId, List<CartGoods.MaterialGoods> productMaterialList) {
         if (operationType != null && operationType == 1 && StringUtils.isBlank(couponCode)) {
             throw new ServiceException(ResponseResult.PARAMETER_MISSING, "商品券券号为空");
         }
@@ -238,7 +256,10 @@ public class ShoppingCartMCoffeeServiceImpl {
                     //使用券的是，如果购物车已经存在这个券，先清除，再添加
                     cartGoods.setQty(0);
                 }
-                if (StringUtils.isNotEmpty(goodsId) && StringUtils.isBlank(couponCode) && goodsId.equals(cartGoods.getSkuId())) {
+                if (StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && goodsId.equals(cartGoods.getSkuId()) && StringUtils.isBlank(cartGoods.getCouponCode())) {
+                    if (CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())) {
+                        productMaterialList.addAll(cartGoods.getProductMaterialList());
+                    }
                     if (cartGoods.getQty() > 1 ){
                         cartGoods.setQty(cartGoods.getQty() - 1);
                     }else {