Merge branch 'feature/zxh/【技术线】新增订单用户来源类型等字段-20220908'

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

@@ -16,7 +16,6 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.*;
 import com.freemud.application.sdk.api.ordercenter.enums.*;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderSourceV1;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
-import com.freemud.application.sdk.api.ordercenter.enums.orderv1.RefundStatusV1;
 import com.freemud.application.sdk.api.ordercenter.request.*;
 import com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest;
 import com.freemud.application.sdk.api.ordercenter.request.create.*;
@@ -349,6 +348,9 @@ public class OrderSdkAdapter {
             Date time = requestVO.getEstimateDeliveryCompleteTime();
             request.setEstimateDeliveryCompleteTime(time.getTime() + "");
         }
+        request.setUserMobile(requestVO.getUserMobile());
+        request.setUserSourceType(requestVO.getUserSourceType());
+        request.setPhysicalGoodsFlag(requestVO.getPhysicalGoodsFlag());
         return request;
     }
 
@@ -1244,7 +1246,7 @@ public class OrderSdkAdapter {
         //20201222 新增配送类型 ->【ID1021986】
         //【订单开放平台】订单详情查询接口增加配送类型字段
         data.setExpressType(orderInfoReqs.getExpressType());
-
+        data.setUserMobile(orderInfoReqs.getUserMobile());
 
         if (orderInfoReqs.getOrderExtended() != null) {
             // 围餐门店英文名称

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

@@ -195,6 +195,23 @@ public class BaseCreateOrderRequest extends BaseConfig {
      */
     private Date estimateDeliveryCompleteTime;
 
+    /**
+     * 实物商品订单标记 1:实物商品订单 2:虚拟商品订单 (之前的一些卖券单(biz=6)等，都没有传递该标记，所以默认为0)
+     * @see cn.freemud.enums.OrderPhysicalGoodsFlagEnum
+     */
+    private Integer physicalGoodsFlag;
+
+    /**
+     * 下单用户手机号（小程序用户下单时绑定的手机号，非（收货人/联系人）手机号）
+     */
+    private String userMobile;
+
+    /**
+     * 下单用户来源类型: 0:存量未定义 1:开个店用户 2:自定义用户 3:未传递系统随机生成用户
+     * @see cn.freemud.enums.OrderUserSourceTypeEnum
+     */
+    private Integer userSourceType = 1;
+
 //    @Data
 //    public static class DeliveryTypeInfo {
 //        /**

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

@@ -13,10 +13,11 @@ import cn.freemud.entities.dto.product.pointsmall.ProductStockRequest;
 import cn.freemud.entities.dto.product.pointsmall.UpdatePointsMallStocksRequest;
 import cn.freemud.entities.dto.user.UseScoreRequest;
 import cn.freemud.entities.vo.CreateOrderResponseVo;
+import cn.freemud.enums.OrderPhysicalGoodsFlagEnum;
+import cn.freemud.enums.OrderUserSourceTypeEnum;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
-import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderSettlementType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest;
@@ -31,7 +32,10 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 @Component
 public class PointsMallOrderAdapter {
@@ -120,6 +124,9 @@ public class PointsMallOrderAdapter {
         request.setOperator(userLoginInfoDto.getNickName());
         request.setAppId(userLoginInfoDto.getWxAppId());
         request.setPayChannel(channel);
+        request.setUserSourceType(OrderUserSourceTypeEnum.USERSOURCETYPE_ONE);
+        request.setUserMobile(userLoginInfoDto.getMobile());
+        request.setPhysicalGoodsFlag(productBean.getProductType() == 1 ? OrderPhysicalGoodsFlagEnum.PHYSICALGOODSFLAG_TWO:OrderPhysicalGoodsFlagEnum.PHYSICALGOODSFLAG_ONE);
         return request;
 
     }

order-application-service/src/main/java/cn/freemud/enums/OrderPhysicalGoodsFlagEnum.java

+package cn.freemud.enums;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/9/5 10:35
+ * @description :
+ */
+public interface OrderPhysicalGoodsFlagEnum {
+    /**
+     * 0:存量未定义
+     */
+    public static Integer PHYSICALGOODSFLAG_ZERO = 0;
+    /**
+     * 1:实物商品订单
+     */
+    public static Integer PHYSICALGOODSFLAG_ONE = 1;
+    /**
+     * 2:虚拟商品订单
+     */
+    public static Integer PHYSICALGOODSFLAG_TWO = 2;
+}

order-application-service/src/main/java/cn/freemud/enums/OrderUserSourceTypeEnum.java

+package cn.freemud.enums;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/9/5 10:31
+ * @description :
+ */
+public interface OrderUserSourceTypeEnum {
+    /**
+     * 0:存量未定义
+     */
+    public static Integer USERSOURCETYPE_ZERO = 0;
+    /**
+     * 1:开个店用户
+     */
+    public static Integer USERSOURCETYPE_ONE = 1;
+    /**
+     * 2:自定义用户
+     */
+    public static Integer USERSOURCETYPE_TWO = 2;
+    /**
+     * 3:未传递系统随机生成用户
+     */
+    public static Integer USERSOURCETYPE_THREE = 3;
+}

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

@@ -28,8 +28,6 @@ import cn.freemud.enums.*;
 import cn.freemud.handler.MemberBlacklistHandler;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
-import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
-import cn.freemud.management.entities.dto.response.pay.OrderRefundResponse;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
 import cn.freemud.manager.SpellGroupOrderDataManager;
 import cn.freemud.redis.RedisCache;
@@ -288,6 +286,9 @@ public class MallOrderServiceImpl implements MallOrderService {
             baseCreateOrderRequest.setOrderExtended(orderExtendedReq);
             baseCreateOrderRequest.setMarketingType(MarketTypeEnum.ORDER.getIndex().byteValue());
             baseCreateOrderRequest.setBizType(BizTypeEnum.MALL.getBizType());
+            baseCreateOrderRequest.setUserMobile(userLoginInfoDto.getMobile());
+            baseCreateOrderRequest.setPhysicalGoodsFlag(OrderPhysicalGoodsFlagEnum.PHYSICALGOODSFLAG_ONE);
+            baseCreateOrderRequest.setUserSourceType(OrderUserSourceTypeEnum.USERSOURCETYPE_ONE);
             OrderClientType orderClient = OrderClientType.SAAS;
             if (ChannelEnum.TYPE_2.getCode().equals(userLoginInfoDto.getChannel())) {
                 orderClient = OrderClientType.ALIPAY;

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

@@ -2511,6 +2511,8 @@ public class OrderServiceImpl implements Orderservice {
         baseCreateOrderRequest.setOrderClient(orderClient);
         baseCreateOrderRequest.setAppId(appId);
         baseCreateOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
+        baseCreateOrderRequest.setUserMobile(userLoginInfoDto.getMobile());
+        baseCreateOrderRequest.setPhysicalGoodsFlag(OrderPhysicalGoodsFlagEnum.PHYSICALGOODSFLAG_ONE);
         CreateOrderRequest createOrderRequest = new CreateOrderRequest();
         createOrderRequest.setBaseCreateOrderRequest(baseCreateOrderRequest);
         createOrderRequest.setOpenId(userLoginInfoDto.getOpenId());

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

@@ -946,7 +946,8 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         request.setAppId(userLoginInfoDto.getWxAppId());
         request.setUserMobile(userLoginInfoDto.getMobile());
         //2:虚拟商品订单
-        request.setPhysicalGoodsFlag(2);
+        request.setPhysicalGoodsFlag(OrderPhysicalGoodsFlagEnum.PHYSICALGOODSFLAG_TWO);
+        request.setUserSourceType(OrderUserSourceTypeEnum.USERSOURCETYPE_ONE);
         return request;
 
     }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/adapter/OrderCenterSdkAdapter.java

@@ -61,7 +61,7 @@ public class OrderCenterSdkAdapter {
         data.setDownstreamPosCode(orderInfoReqs.getDownstreamPosCode());
         data.setDownstreamThirdOrderCode(orderInfoReqs.getDownstreamThirdOrderCode());
         data.setAppId(orderInfoReqs.getAppId());
-
+        data.setUserMobile(orderInfoReqs.getUserMobile());
         //20201222 新增配送类型 ->【ID1021986】
         //【订单开放平台】订单详情查询接口增加配送类型字段
         data.setExpressType(orderInfoReqs.getExpressType());

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/v1/OrderBeanV1.java

@@ -168,9 +168,16 @@ public class OrderBeanV1 {
     private String payVoucher;
 
     /**
-     * 手机号
+     * 手机号  这个老手机号,取 delivery_contact_info 的数据, 历史遗漏问题,其他地方有使用, 不进行改动,
      */
     private String phone;
+
+
+    /**
+     * 下单用户手机号
+     */
+    private String userMobile;
+
     private String posId;
     private String remark;
     /**

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

@@ -258,6 +258,7 @@ public class CreateOrderRequest extends BaseRequest {
 
     /**
      * 实物商品订单标记 1:实物商品订单 2:虚拟商品订单 (之前的一些卖券单(biz=6)等，都没有传递该标记，所以默认为0)
+     * @see cn.freemud.enums.OrderPhysicalGoodsFlagEnum
      */
     private Integer physicalGoodsFlag;
 
@@ -266,6 +267,11 @@ public class CreateOrderRequest extends BaseRequest {
      */
     private String userMobile;
 
+    /**
+     * 下单用户来源类型: 0:存量未定义 1:开个店用户 2:自定义用户 3:未传递系统随机生成用户
+     * @see cn.freemud.enums.OrderUserSourceTypeEnum
+     */
+    private Integer userSourceType = 1;
     @Data
     public static class ChooseGood {
 

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

@@ -396,6 +396,11 @@ public class OrderInfoReqs {
     private String operator;
 
     /**
+     * 下单用户手机号
+     */
+    private String userMobile;
+
+    /**
      * 订单扩展信息 （门店渠道信息）
      */
     private OrderExtendedReq orderExtended;