Merge branch 'hotfix/20200522_同意退款取消配送单fixbug' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-shoppingcart-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/dto/OrderExtInfoDto.java
#	order-application-service/src/main/java/cn/freemud/service/AppOrderService.java
#	order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
#	shopping-cart-application-service/pom.xml

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

@@ -2,16 +2,10 @@ package com.freemud.sdk.api.assortment.order.adapter;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.freemud.application.sdk.api.membercenter.request.GetMemberLabelsResponse;
 import com.freemud.application.sdk.api.membercenter.response.GetMemberExtendInfoResponse;
-import com.freemud.application.sdk.api.membercenter.response.GetMemberPaids;
-import com.freemud.application.sdk.api.membercenter.response.MemberGradeResponse;
-import com.freemud.application.sdk.api.membercenter.response.PaidsResponse;
 import com.freemud.application.sdk.api.promotioncenter.request.promotion.CalculationDiscountRequest;
-import com.freemud.sdk.api.assortment.order.entities.OrderExtInfoDTO;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
 import com.freemud.sdk.api.assortment.order.request.order.ActivityCancelStockRequest;
-import com.freemud.sdk.api.assortment.order.request.order.ConfirmOrderRequest;
 import com.freemud.sdk.api.assortment.order.request.order.CouponCodeVerificationProductRequest;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse.DataBean.OrderBean;
@@ -19,7 +13,9 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Component

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

@@ -20,7 +20,6 @@ import com.freemud.application.sdk.api.util.DateUtil;
 import com.freemud.sdk.api.assortment.order.domain.OrderStatesVO;
 import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
 import com.freemud.sdk.api.assortment.order.entities.OrderEditInfo;
-import com.freemud.sdk.api.assortment.order.entities.OrderExtInfoDTO;
 import com.freemud.sdk.api.assortment.order.enums.*;
 import com.freemud.sdk.api.assortment.order.request.order.OrderDownloadRequest;
 import com.freemud.sdk.api.assortment.order.request.order.*;
@@ -1462,8 +1461,8 @@ public class OrderSdkAdapter {
     /**
      * 获取自定义信息
      */
-    public OrderExtInfoDTO getOrderExtInfo(OrderPayResponse orderPayResponse, OrderEditInfo orderEditInfo) {
-        OrderExtInfoDTO orderExtInfoDto = new OrderExtInfoDTO();
+    public OrderExtInfoDto getOrderExtInfo(OrderPayResponse orderPayResponse, OrderEditInfo orderEditInfo) {
+        OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto();
         orderExtInfoDto.setOpenid(orderPayResponse.getOpenId());
         String prepayId = "";
         //TODO StringUtils 依赖修改

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/entities/OrderExtInfoDTO.java

@@ -9,7 +9,8 @@
  * @version V1.0
  * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
- */
+ *//*
+
 package com.freemud.sdk.api.assortment.order.entities;
 
 import lombok.Data;
@@ -23,17 +24,23 @@ public class OrderExtInfoDTO {
     private  String formId;
 
     private String accessToken;
-    /**
+    */
+/**
      * 到期时间
-     */
+     *//*
+
     private String expireDate;
-    /**
+    */
+/**
      * 外卖开始时间
-     */
+     *//*
+
     private String deliveryHoursDayStart;
-    /**
+    */
+/**
      * 外卖结束时间
-     */
+     *//*
+
     private String deliveryHoursDayEnd;
 
 
@@ -42,50 +49,69 @@ public class OrderExtInfoDTO {
     private String appid;
 
     private String appsecret;
-    /**
+    */
+/**
      * 订单支付时间
-     */
+     *//*
+
     private String payDate;
-    /**
+    */
+/**
      * 第三方流水号
-     */
+     *//*
+
     private String payTransId;
-    /**
+    */
+/**
      * sessionId
-     */
+     *//*
+
     private String sessionId;
-    /**
+    */
+/**
      * 预计送达时间
-     */
+     *//*
+
     private Integer serviceTime;
-    /**
+    */
+/**
      * 第三方外卖定时推单时间
-     */
+     *//*
+
     private Integer pushOrderTime;
-    /**
+    */
+/**
      *  版本号
-     */
+     *//*
+
     private String version;
 
     private String trackingNo;
-    /**
+    */
+/**
      * 会员规则ID
-     */
+     *//*
+
     private String ruleId;
 
     private String memberLevel;
 
     private boolean paidMember;
 
-    /**
+    */
+/**
      * 微信上报异常补推使用
-     */
+     *//*
+
     private String sessionKey;
 
-    /**
+    */
+/**
      * 来源appId
-     */
+     *//*
+
     private String fromAppId;
 
     private String fmId;
 }
+*/

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

@@ -49,12 +49,20 @@ public class ConfirmOrderRequest extends BaseConfig {
      * 自定义字段
      */
     private String extInfo;
-    //操作人
+    /**
+     * 操作人
+     */
     private String operator;
     private List<OrderSettlement>orderSettlements;
 
-    //用户预约时间，仅为预约单时存放
+    /**
+     * 用户预约时间，仅为预约单时存放
+     */
     private String expectTime;
+    /**
+     * 渠道方流水号 （比如扫呗，易宝等） 新支付服务做中转使用
+     */
+    private String endTransId;
 
     @Data
     public static class OrderSettlement{

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

@@ -57,7 +57,6 @@ import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
 import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
 import com.freemud.sdk.api.assortment.order.adapter.*;
 import com.freemud.sdk.api.assortment.order.entities.OrderEditInfo;
-import com.freemud.sdk.api.assortment.order.entities.OrderExtInfoDTO;
 import com.freemud.sdk.api.assortment.order.enums.*;
 import com.freemud.sdk.api.assortment.order.request.order.CreateOrderRequest;
 import com.freemud.sdk.api.assortment.order.request.order.OrderDownloadRequest;
@@ -273,11 +272,12 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             extendInfoRequest.setMemberId(orderByIdResponse.getData().getUserId());
             extendInfoRequest.setPartnerId(orderByIdResponse.getData().getCompanyId());
             extendInfo = memberCenterService.getMemberExtendInfo(extendInfoRequest,confirmOrderRequest.getTrackingNo());
-            OrderExtInfoDTO extInfoDTO = JSONObject.parseObject(orderByIdResponse.getData().getExtInfo(),OrderExtInfoDTO.class);
+            OrderExtInfoDto extInfoDTO = JSONObject.parseObject(orderByIdResponse.getData().getExtInfo(),OrderExtInfoDto.class);
             extInfoDTO.setMemberLevel(extendInfo.getData().getMemberGrade()!=null?extendInfo.getData().getMemberGrade().getRuleName():"");
             extInfoDTO.setPaidMember(CollectionUtils.isNotEmpty(extendInfo.getData().getMemberPaids()));
             extInfoDTO.setPayTransId(confirmOrderRequest.getPayTransId());
             extInfoDTO.setPayDate(confirmOrderRequest.getPayDate());
+            extInfoDTO.setEndTransId(confirmOrderRequest.getEndTransId());
             request.setExtInfo(JSON.toJSONString(extInfoDTO));
         }catch (Exception e){
             ErrorLog.printErrorLog("getMemberExtendInfoError",MEMBER_EXTEND_INFO,confirmOrderRequest,e);
@@ -953,7 +953,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
      */
     public BaseOrderResponse updateOrderInfo(OrderPayResponse orderPayResponse, OrderEditInfo orderEditInfo) {
         //TODO 创建自定义信息
-        OrderExtInfoDTO orderExtInfo = orderSdkAdapter.getOrderExtInfo(orderPayResponse, orderEditInfo);
+        OrderExtInfoDto orderExtInfo = orderSdkAdapter.getOrderExtInfo(orderPayResponse, orderEditInfo);
         OrderEditRequest orderEditRequest = new OrderEditRequest(orderPayResponse.getPayTransId(),
                 JSONObject.toJSONString(orderExtInfo));
         orderEditRequest.setOrderId(orderPayResponse.getOrderId());

assortment-shoppingcart-sdk/readme.md

 #### 购物车sdk更新记录
 | 版本号        | 版本说明     | 更新人        | 更新时间   |
 | --------------| ------------ | ------------- | ---------- |
-| 1.1.0.RELEASE| 第一个release版本  | 丁凯 | 2020-03-04  |
+| 1.1.0.RELEASE| 第一个release版本  | 丁凯 | 2020-03-04  |
\ No newline at end of file
+| 1.1.1.RELEASE| 升级券码sdk  | 胡超 | 2020-05-18  |
\ No newline at end of file

call-back-service/src/main/java/cn/freemud/service/impl/ToolsServiceImpl.java

@@ -79,7 +79,7 @@ public class ToolsServiceImpl implements ToolsService {
             for (OrderInfoReqs reqs : response.getResult()) {
                 Header header = new Header("report", "call-back-service-api",
                         OrderCallBackConfig.INVOICE_ROUTE_KEY, OrderCallBackConfig.INVOICE_QUEUE);
-
+                reqs.setPickUpGoodsNo("2020"+reqs.getPickUpGoodsNo());
                 MQMessage<String> message = new MQMessage<>(header, JSON.toJSONString(reqs));
                 mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.INVOICE_ROUTE_KEY, message);
             }

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

@@ -1200,7 +1200,7 @@ public class OrderAdapter {
      * 格式化日期字符串，从yyyy-MM-dd HH:mm:ss -> MM-dd HH:mm
      */
     public String dateStringFormatToString(String date) {
-        return "";
+        return date.substring(5, 16);
     }
 
     /**

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

@@ -51,7 +51,7 @@ public class CreatePrepayRequestDto {
      */
     private OrderExtInfoDto orderExtInfoDTO;
     /**
-     * 交易请求号 
+     * 交易请求号
      */
     private String transId;
 }

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

@@ -99,7 +99,6 @@ import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
 import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
-import com.freemud.sdk.api.assortment.order.util.LockUtils;
 import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
 import com.freemud.sdk.api.assortment.orderdistributor.entity.dto.PaymentMqMessageDto;
 import com.freemud.sdk.api.assortment.orderdistributor.service.PaymentQueueService;
@@ -112,7 +111,6 @@ import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.ToStringBuilder;

order-management/src/main/java/cn/freemud/management/service/handle/DeliveryHandle.java

@@ -114,7 +114,7 @@ public class DeliveryHandle {
             //商家退款取消配送
             cancelDeliveryOrderRequestDto.setOrderCancelDescription("顾客取消订单");
             DeliveryResponseDto deliveryResponse = deliveryService.deliveryOrderCancel(cancelDeliveryOrderRequestDto, LogThreadLocal.getTrackingNo());
-            if (deliveryResponse == null || ObjectUtils.notEqual(Integer.getInteger(ResponseResult.SUCCESS.getCode()), deliveryResponse.getCode())) {
+            if (deliveryResponse == null || !StringUtils.equals(ResponseResult.SUCCESS.getCode(), deliveryResponse.getCode()+"")) {
                 throw new DeliveryServiceException(ResponseResult.DELIVERY_CANCEL_ORDER_ERROR, deliveryResponse.getMsg());
             }
         }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -19,6 +19,9 @@ public class OrderExtInfoDto {
 
     private  String prepayId;
 
+    /**
+     * 支付宝小程序订单特定模板消息需要
+     */
     private  String formId;
 
     private String accessToken;
@@ -65,9 +68,55 @@ public class OrderExtInfoDto {
      *  版本号
      */
     private String version;
+
+    private String trackingNo;
+    /**
+     * 会员规则ID
+     */
+    private String ruleId;
+    /**
+     * 预支付 transId
+     */
+    private String prePayTransId;
+
+    private String memberLevel;
+
+    private boolean paidMember;
+
+    /**
+     * 微信上报异常补推使用
+     */
+    private String sessionKey;
+
     /**
      * 来源appId
      */
     private String fromAppId;
 
+    private String fmId;
+    /**
+     * 创建预支付订单userId
+     */
+    private String prePayUserId;
+
+    /**
+     * 用户手机号
+     */
+    private String phone;
+    /**
+     * 平台支付订单号(微信订单号)
+     */
+    private String paid_no;
+    /**
+     * 渠道方流水号 （比如扫呗，易宝等） 新支付服务做中转使用
+     */
+    private String endTransId;
+    /**
+     * 第三方支付商户号 新支付服务做中转使用
+     */
+    private String platformMchId;
+    /**
+     * 扫呗商户号 新支付服务做中转使用
+     */
+    private String terminalId;
 }