Merge branch 'KA-有数上报' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

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

@@ -32,7 +32,6 @@ import com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq;
 import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
 import com.freemud.application.sdk.api.ordercenter.response.PaySuccessResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.promotioncenter.request.promotion.ActivityUpdateStockRequest;
 import com.freemud.application.sdk.api.promotioncenter.service.PromotionSdkService;
@@ -221,6 +220,8 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
 
         com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest request = orderSdkAdapter.convent2NEWCreateOrderRequest(config.getBaseCreateOrderRequest());
 //        AssortOrderLogUtil.info("fisherman 请求基础服务,最终构建 04",config!=null?JSON.toJSONString(config):null);
+        // fisherman 创建订单 extinfo 存储 信息,有数上报需要使用, 更新接口直接重新覆盖就行
+        request.setExtInfo(this.getTempExtInfoMsg(config.getOpenId(),config.getBaseCreateOrderRequest().getAppId()));
         OrderBaseResp<OrderInfoReqs> order = orderSdkService.createOrder(request, config.getTrackingNo());
         CreateOrderResponse createOrderResponse = orderSdkAdapter.convent2NEWOrderInfoReqs(order);
         if (!RESPONSE_SUCCESS.equals(createOrderResponse.getErrcode())
@@ -236,6 +237,13 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
         return createOrderResponse;
     }
 
+    private String getTempExtInfoMsg(String openId, String appId) {
+        OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto();
+        orderExtInfoDto.setAppid(appId);
+        orderExtInfoDto.setOpenid(openId);
+        return JSON.toJSONString(orderExtInfoDto);
+    }
+
     private Integer convertAssortmentSettlementTypeToNewOrderSettlementType(OldOrderAccountType settlementType) {
         if (settlementType == OldOrderAccountType.WEIXIN) {
             return OrderSettlementType.WEIXIN.getIndex();

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

@@ -105,11 +105,9 @@ import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest;
 import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentCloseUnifiedOrderRequest;
 import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentQueryRequest;
-import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmountRequest;
 import com.freemud.application.sdk.api.paymentcenter.client.response.CodePayResponse;
 import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentCloseUnifiedOrderResponse;
 import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentQueryResponse;
-import com.freemud.application.sdk.api.paymentcenter.client.response.SVCCardAmountResponse;
 import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
 import com.freemud.application.sdk.api.storecenter.request.GetListByCodesRequest;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
@@ -130,7 +128,6 @@ import com.freemud.sdk.api.assortment.order.enums.QueryDeliveryType;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.request.payment.CombPayRequest;
 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.vo.ProductGroupVo;
 import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
@@ -163,6 +160,8 @@ import java.util.stream.Collectors;
 
 import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
 
+//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
+
 
 @Service
 public class OrderServiceImpl implements Orderservice {
@@ -2785,9 +2784,6 @@ public class OrderServiceImpl implements Orderservice {
      */
     public CreateOrderResponse createOrder(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto, ShoppingCartGoodsDto shoppingCartGoodsDto,
                                            OrderExtendedReq orderExtendedReq, OrderClientType orderClient, String appId,String openId) {
-//        AppLogUtil.infoLog("fisherman 请求基础服务,最终构建 01 ",createOrderVo,storeResponseDto);
-//        AppLogUtil.infoLog("fisherman 请求基础服务,最终构建 02 ",shoppingCartGoodsDto,orderExtendedReq);
-//        AppLogUtil.infoLog("fisherman 请求基础服务,最终构建 03 ",orderClient,null);
         BaseCreateOrderRequest baseCreateOrderRequest = orderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto, storeResponseDto);
         //查询第三方商品编号
         baseCreateOrderRequest = getProductCustomerCode(baseCreateOrderRequest);