Merge branch 'KA-有数上报'

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

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

@@ -180,7 +180,6 @@ public class OrderAdapter {
         ArrayList<CreateOrderAccountRequest> orderAccountDtos = new ArrayList<>();
         long deliveryAmount = 0;
         long discountDeliveryAmount = 0;
-        AppLogUtil.infoLog("fisherman 计算discountDeliveryAmount 的操作 begin", shoppingCartGoodsDto, createOrderVo);
         if (createOrderVo.getMenuType().equals(BusinessTypeEnum.SAAS_DELIVERY.getCode())) {
             deliveryAmount = shoppingCartGoodsDto.getDeliveryAmount() == null ? 9l : shoppingCartGoodsDto.getDeliveryAmount();
             discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount() == null ? 9l : shoppingCartGoodsDto.getDeliveryAmount();
@@ -207,7 +206,6 @@ public class OrderAdapter {
         Long totalScore = shoppingCartGoodsDto.getTotalScore() == null ? 0L : shoppingCartGoodsDto.getTotalScore();
         createOrderDto.setTotalScore(totalScore);
 
-        AppLogUtil.infoLog("fisherman 计算discountDeliveryAmount 的操作 end", deliveryAmount, discountDeliveryAmount);
         //商城实付无需加上配送费用和包装费
         if (createOrderVo.getMenuType().equals(BusinessTypeEnum.SAAS_MALL.getCode())) {
             createOrderDto.setAmount(shoppingCartGoodsDto.getTotalAmount());
@@ -1564,7 +1562,6 @@ public class OrderAdapter {
             list.add(responseVo);
         }
 
-        AppLogUtil.infoLog("fisherman orderBean:", JSON.toJSONString(ordersBeans), JSON.toJSONString(list));
         return list;
     }
 

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/CheckOrder.java

@@ -1060,7 +1060,6 @@ public class CheckOrder {
         request.setPartnerId(partnerId);
         request.setStoreCode(storeCode);
         StoreCBaseResponse<StoreCBaseResponseDto> responseDto = storeBaseApiClient.queryDeliverDetail(request);
-        AppLogUtil.infoLog("fisherman 获取门店预计送达时间", request, responseDto);
         if (responseDto == null) {
             throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR);
         }

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

@@ -103,11 +103,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;
@@ -128,7 +126,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;
@@ -161,6 +158,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 {
@@ -2777,10 +2776,10 @@ 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);
+        // 预先前置 设置 支付方式
+        this.preSetPayChannelType(baseCreateOrderRequest,createOrderVo);
+
         //查询第三方商品编号
         baseCreateOrderRequest = getProductCustomerCode(baseCreateOrderRequest);
         //保存门店渠道信息
@@ -2800,6 +2799,36 @@ public class OrderServiceImpl implements Orderservice {
         return orderBusinessService.createOrderFlow(createOrderRequest);
     }
 
+    private void preSetPayChannelType(BaseCreateOrderRequest request, CreateOrderVo createOrderVo) {
+        Long amount = request.getAmount();
+        String cardCode = createOrderVo.getCardCode();
+        CreateOrderVo.UnionPayCard unionPayCard = createOrderVo.getUnionPayCard();
+        if (amount > 0){
+            PayChannelType channelType = null;
+            // 风味卡支付
+            if (Objects.nonNull(unionPayCard)){
+                channelType = PayChannelType.USVCP;
+                this.setPrePayChannel(request,channelType);
+            }else if (StringUtils.isNotBlank(cardCode)) {
+                // 储值卡支付
+                channelType = PayChannelType.SVC;
+                this.setPrePayChannel(request,channelType);
+            }else {
+                // 现金支付-> 不管 前端有传递
+            }
+
+        }else if (amount == 0){
+            PayChannelType channelType = PayChannelType.ZERO;
+            this.setPrePayChannel(request,channelType);
+        }
+    }
+
+    private void setPrePayChannel(BaseCreateOrderRequest request, PayChannelType channelType){
+        request.setPayChannelType(channelType.getIndex());
+        request.setPayChannel(channelType.getEbcode());
+        request.setPayChannelName(channelType.getName());
+    }
+
     /**
      * 创建父子订单
      */