合并代码

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.0.8-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -33,7 +33,6 @@
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
             <version>1.0.3-SNAPSHOT</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -592,6 +592,8 @@ public class OrderSdkAdapter {
             }
             if (orderCostResp.getCostType() == 5) {
                 accountBean.setType(OldOrderAccountType.CARD_ORIGINAL_AMOUNT.getCode());
+            }if (orderCostResp.getCostType() == 7) {
+                accountBean.setType(OldOrderAccountType.DRIVER_FEE.getCode());
             }
             accountBean.setAddInfo("");
             accountList.add(accountBean);

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

@@ -22,6 +22,7 @@ public enum OldOrderAccountType {
     COUPON(5, "代金券", "COUPON"),
     PRODUCT_COUPON(6, "商品券", "PRODUCT_COUPON"),
     DISCOUNT_COUPON(7, "折扣券", "DISCOUNT_COUPON"),
+    DRIVER_FEE(7, "骑手小费", "DRIVER_FEE"),
     DISCOUNT_AMOUNT(21, "限时折扣", "DISCOUNT_AMOUNT"),
     PREMIUM_EXCHANGE(22, "加价购", "PREMIUM_EXCHANGE"),
     SECOND_DISCOUNT(23, "第二件N折", "SECOND_DISCOUNT"),

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

@@ -43,6 +43,14 @@ public class ConfirmOrderRequest extends BaseConfig {
     private String extInfo;
     //操作人
     private String operator;
+    /**
+     * 订单支付时间
+     */
+    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.GetMemberExtendInfoRequest;
@@ -77,6 +78,7 @@ import java.util.List;
 import java.util.Map;
 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;
 
@@ -253,11 +255,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

@@ -354,6 +354,8 @@ public class OrderServiceImpl implements Orderservice {
         var1.setOrderType(orderBean.getType());
         var1.setProductOrderCode(orderBean.getOid());
         var1.setOperator(orderBean.getUserName());
+        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);
@@ -420,15 +422,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);