Merge remote-tracking branch 'remotes/origin/20201026-queryRefundCount-刘鹏飞' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	ordercenter-sdk/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.0.18-SNAPSHOT</version>
+    <version>2.0.19-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -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>

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);
+
 }

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;
 }