Merge branch 'feature/20201223-订单详情查询接口增加配送类型字段-张志恒' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.2.24-SNAPSHOT</version>
+    <version>2.2.25-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -140,3 +140,7 @@
 | 2.1.8-RELEASE | 拼单 | 缪晖 | 2020-12-10 |
 | 2.1.9-RELEASE | 去掉0元核销优惠券 | 李小二 | 2020-12-14 |
 >>>>>>> feature/20201216_切换门店清除代金券缓存_yu.sun
+
+| 2.1.10-RELEASE | coco | 刘鹏飞 | 2020-12-17 |
+| 2.1.11-RELEASE | 农工商添加设备号 | 梁崇福 | 2020-12-17 |
+| 2.2.25-SNAPSHOT | 订单详情查询接口增加配送类型字段 | 张志恒 | 2020-12-23 |
\ No newline at end of file

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

@@ -21,6 +21,7 @@ import lombok.NoArgsConstructor;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
+import javax.persistence.Column;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -431,6 +432,11 @@ public class QueryOrdersResponse {
             // 预计到达时间
             private Long estimateDeliveryCompleteTime;
 
+            /**
+             * 配送类型 1自配送(三方渠道配送、商家店员配送) 2平台配送
+             */
+            private Byte expressType;
+
             @NoArgsConstructor
             @Data
             public static class AddDeliveryInfo {

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -233,7 +233,8 @@ public class OrderController {
     @ApiAnnotation(logMessage = "deleteOrderById")
     @PostMapping("/deleteOrderById")
     public BaseResponse deleteOrderById(@Validated @LogParams @RequestBody DeleteOrderVo deleteOrderVo) {
-        return orderservice.deleteOrderById(deleteOrderVo);
+        //return orderservice.deleteOrderById(deleteOrderVo);
+        return orderservice.cancelPayOrder(deleteOrderVo);
     }
 
     /**
@@ -385,6 +386,16 @@ public class OrderController {
     }
 
     /**
+     * timeOutRefund
+     * @param timeOutOrderVo
+     * @return
+     */
+    @ApiAnnotation(logMessage = "timeOutOrderRefund")
+    @PostMapping("/timeOutOrderRefund")
+    public BaseResponse timeOutOrderRefund(@Validated @LogParams @RequestBody TimeOutOrderVo timeOutOrderVo){
+        return orderservice.timeOutOrderRefund(timeOutOrderVo);
+    }
+    /**
      * 根据订单号查询配送操作日志及骑手位置
      * @param requestVo
      * @return

order-application-service/src/main/java/cn/freemud/entities/dto/PaySuccessBuridPointDto.java

+package cn.freemud.entities.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PaySuccessBuridPointDto {
+
+    /**
+     * 用户id
+     */
+    @JsonProperty("user_id")
+    private String userId;
+
+    /**
+     * 用户行为标识 9=结算支付
+     */
+    private String action;
+
+    /**
+     * 商户ID
+     */
+    @JsonProperty("partner_id")
+    private String partnerId;
+
+    /**
+     * 门店ID
+     */
+    @JsonProperty("store_id")
+    private String storeId;
+
+    /**
+     * 商品Id
+     */
+    private List<String> skus;
+
+    /**
+     * 商品Id
+     */
+    @JsonProperty("create_time")
+    private String createTime;
+
+}

order-application-service/src/main/java/cn/freemud/entities/dto/QueryOrdersResponseDto.java

@@ -200,7 +200,7 @@ public class QueryOrdersResponseDto {
 
             private List<OrderCostResp> orderCostDetailList;
             private List<QueryOrdersResponse.DataBean.OrderBean.OrderPayItem> orderPayItem;
-
+            private Integer abnormalState;
             /**
              * 订单操作状态(从订单操作历史表中获取)
              */

order-application-service/src/main/java/cn/freemud/entities/vo/TimeOutOrderVo.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: GetProductVo
+ * @Package cn.freemud.entities.vo
+ * @Description:
+ * @author: liming.guo
+ * @date: 2018/5/16 17:35
+ * @version V1.0
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+package cn.freemud.entities.vo;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+@Data
+public class TimeOutOrderVo {
+
+    @NotEmpty(message = "订单编号不能为空")
+    private String oid;
+
+    private String partnerId;
+
+}

order-application-service/src/main/java/cn/freemud/service/BuriedPointService.java

@@ -26,4 +26,6 @@ public interface BuriedPointService {
      * 埋点支付
      */
     BaseResponse BuriedPointPayment(BuriedPointPaymentRequestDto requestDto, QueryOrdersResponseDto.DataBean.OrderBean orderBean);
+
+    BaseResponse paySuccessBuridPoint(String partnerId,String storeId,QueryOrdersResponseDto.DataBean.OrderBean orderBean);
 }

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -144,5 +144,7 @@ public interface Orderservice {
     BaseResponse queryCollageOrderById(Integer operation,String sessionId, String oid, String partnerId,String channel);
 
 
+    BaseResponse timeOutOrderRefund(TimeOutOrderVo timeOutOrderVo);
+
     BaseResponse queryOrderRider(OrderRiderRequestVo requestVo);
 }

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

@@ -9,6 +9,7 @@ import cn.freemud.enums.GuessLikeStatus;
 import cn.freemud.manager.OpenPlatformIappWxappConfigManager;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.BuriedPointService;
+import cn.freemud.service.thirdparty.BuriedPointClient;
 import cn.freemud.service.thirdparty.SyncTxProductClient;
 import cn.freemud.utils.LogUtil;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIappWxappConfig;
@@ -61,6 +62,8 @@ public class BuriedPointServiceImpl implements BuriedPointService {
     private AssortmentOpenPlatformWxappManager openPlatformWxappManager;
     @Autowired
     private AssortmentOpenPlatformIappWxappConfigManager openPlatformIappWxappConfigManager;
+    @Autowired
+    private BuriedPointClient buriedPointClient;
 
     @Override
     public BaseResponse BuriedPointPayment(BuriedPointPaymentRequestDto requestDto, QueryOrdersResponseDto.DataBean.OrderBean orderBean) {
@@ -166,4 +169,30 @@ public class BuriedPointServiceImpl implements BuriedPointService {
         }
         return false;
     }
+
+    public BaseResponse paySuccessBuridPoint(String partnerId,String storeId,QueryOrdersResponseDto.DataBean.OrderBean orderBean) {
+        try {
+            PaySuccessBuridPointDto paySuccessBuridPointDto = new PaySuccessBuridPointDto();
+            paySuccessBuridPointDto.setPartnerId(partnerId);
+            paySuccessBuridPointDto.setStoreId(storeId);
+            paySuccessBuridPointDto.setUserId(orderBean.getUserId());
+            paySuccessBuridPointDto.setAction("9");
+            paySuccessBuridPointDto.setCreateTime(DateUtil.convert2String(new Date(),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+            List<QueryOrdersResponseDto.DataBean.OrderBean.ProductBean> productList = orderBean.getProductList();
+            List<String> skus = new ArrayList<>(0);
+            for (int i = 0; i < productList.size(); i++) {
+                QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean = productList.get(i);
+                if (StringUtils.isNotBlank(productBean.getParentProductId())) {
+                    skus.add(productBean.getProductId());
+                }
+            }
+
+            paySuccessBuridPointDto.setSkus(skus);
+            log.info("paySuccessBuridPoint {}" + paySuccessBuridPointDto);
+            Integer str = buriedPointClient.returnSubmit(paySuccessBuridPointDto);
+        } catch (Exception e) {
+            log.info("paySuccessBuridPoint error {}" + e);
+        }
+        return null;
+    }
 }

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

@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -92,7 +93,8 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
     private OrderCommonService orderCommonService;
     @Autowired
     private SellCouponOrderServiceImpl sellCouponOrderService;
-
+    @Value("${saas.autoRefund.client}")
+    private String autoRefundClient;
     @Override
     public BaseResponse createOrderNew(CreateOrderVo createOrderVo) {
         AssortmentCustomerInfoVo assortmentCustomerInfoVo = assortmentCustomerInfoManager.getCustomerInfoByObject(createOrderVo.getSessionId());
@@ -242,6 +244,12 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())){
                 return orderAdapter.sendPaySuccessNoticeMessage();
             }
+            Integer client = OrderSourceType.getClientByCode(orderBean.getSource());
+            //若是app订单超时回调了 订单已取消则做退款处理
+            if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus()) && Arrays.asList(autoRefundClient.split(",")).contains(client.toString())) {
+                orderService.timeOutRefund(orderBean);
+                return orderAdapter.sendPaySuccessNoticeMessage();
+            }
             /*
              * 围餐处理
              */

order-application-service/src/main/java/cn/freemud/service/thirdparty/BuriedPointClient.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: PaymentClient
+ * @Package cn.freemud.service.thirdparty
+ * @Description: 支付服务
+ * @author: liming.guo
+ * @date: 2018/5/12519:24
+ * @version V1.0
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package cn.freemud.service.thirdparty;
+
+import cn.freemud.entities.dto.PaySuccessBuridPointDto;
+import cn.freemud.entities.dto.pay.CombPayResponse;
+import com.freemud.sdk.api.assortment.order.request.payment.CombPayRequest;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+
+@FeignClient(name = "favorite",url="${saas.favorite.submit.url}")
+@RequestMapping(produces = {"application/json;charset=UTF-8"})
+public interface BuriedPointClient {
+
+    /**
+     * 支付成功埋点
+     */
+    @PostMapping("/favorite/submit")
+    Integer returnSubmit(@RequestBody PaySuccessBuridPointDto paySuccessBuridPointDto);
+}

ordercenter-sdk/readme.md

@@ -50,3 +50,6 @@
 | 1.7.6-SNAPSHOT|  拼单列表查询   | 缪晖 | 2020-12-22 |
 | 1.7.7-SNAPSHOT|  添加储值卡支付   | 梁崇福 | 2020-12-22 |
 | 1.7.8-SNAPSHOT|  抖音支付   | 张志恒 | 2020-12-22 |
+| 1.3.23.RELEASE | 拼单 | 缪晖 | 2020-12-10 |
+| 1.3.24.RELEASE | coco | 刘鹏飞 | 2020-12-17 |
+| 1.3.25.RELEASE | 农工商添加设备号 | 梁崇福 | 2020-12-21 |
\ No newline at end of file