Merge branch 'feature/20191216_支付成功接口合并'

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

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

@@ -37,6 +37,14 @@ public class ConfirmOrderRequest extends BaseConfig {
     private Integer timeout;
     //实际支付金额
     private String actualPayAmount;
+    /**
+     * 订单支付时间
+     */
+    private String payDate;
+    /**
+     * 第三方流水号
+     */
+    private String payTransId;
     private List<OrderSettlement>orderSettlements;
     @Data
     public static class OrderSettlement{

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

@@ -13,6 +13,7 @@ import com.freemud.api.assortment.datamanager.order.manager.AssortmentOrderManag
 import com.freemud.api.assortment.datamanager.order.vo.DMOrderItemVo;
 import com.freemud.application.sdk.api.base.BaseResponse;
 import com.freemud.application.sdk.api.log.ApiLog;
+import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.log.ThirdPartyLog;
 import com.freemud.application.sdk.api.membercenter.request.*;
@@ -77,6 +78,7 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.freemud.application.sdk.api.membercenter.constant.InterfaceAddressConstant.MEMBER_EXTEND_INFO;
 import static com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS;
 import static com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR;
 
@@ -249,11 +251,13 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             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());
             request.setExtInfo(JSON.toJSONString(extInfoDTO));
         }catch (Exception e){
+            ErrorLog.printErrorLog("getMemberExtendInfoError",MEMBER_EXTEND_INFO,confirmOrderRequest,e);
 
         }
-
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<PaySuccessResp> response = orderSdkService.paySuccess(request, confirmOrderRequest.getTrackingNo());
 
         CalculationDiscountRequest discountRequest=activitySdkAdapter.convert2CalculationDiscountRequestDto(orderByIdResponse.getData(),extendInfo.getData());

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

@@ -339,6 +339,8 @@ public class OrderServiceImpl implements Orderservice {
         var1.setStoreId(storeId);
         var1.setOrderType(orderBean.getType());
         var1.setProductOrderCode(orderBean.getOid());
+        var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
+        var1.setPayTransId(message.getOut_trade_no());
 
         // 订单支付成功
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(var1);
@@ -405,15 +407,6 @@ public class OrderServiceImpl implements Orderservice {
                 }
             }
         }
-        //TODO 编辑订单额外信息，保存外卖开始时间和外卖结束时间，保存支付信息
-        if (orderExtInfoDto != null) {
-            orderExtInfoDto.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
-            orderExtInfoDto.setPayTransId(message.getOut_trade_no());
-            OrderEditDto orderEditDto = new OrderEditDto(orderBean.getOid(), gson.toJson(orderExtInfoDto));
-            OrderEditRequest orderEditRequest = new OrderEditRequest(orderEditDto.getOrderId(), orderEditDto.getExtInfo());
-            orderEditRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
-            orderCenterSdkService.orderEdit(orderEditRequest);
-        }
         //TODO 清空购物车
         NewShoppingCartClearDto newShoppingCartClearDto = new NewShoppingCartClearDto();
         newShoppingCartClearDto.setPartnerId(partnerId);