销售订单虚拟手机号

fs-service/src/main/java/com/fs/aicall/service/impl/CcParamsServiceImpl.java

@@ -30,7 +30,7 @@ public class CcParamsServiceImpl implements ICcParamsService
     private CcParamsMapper ccParamsMapper;
 
 
-    @Value("${sysconfig.hide-secret}")
+    @Value("${sysconfig.hide-secret:}")//默认为空，不至于报错
     private String sysConfigHideSecret;
 
 

fs-service/src/main/java/com/fs/course/dto/FsOrderDeliveryNoteDTO.java

@@ -13,36 +13,36 @@ public class FsOrderDeliveryNoteDTO {
     /**
      * 系统订单号
      * **/
-    @Excel(name = "系统订单号(必填)",width = 20,sort = 1)
+    @Excel(name = "系统订单号(必填)",width = 20,sort = 10)
     private String orderNumber;
 
-    @Excel(name = "物流公司编号(必填)(SF:顺丰、EMS:邮政、ZTO:中通、JD:京东、DBL:德邦、YTO:圆通)",width = 30,sort = 2)
+    @Excel(name = "物流公司编号(必填)(SF:顺丰、EMS:邮政、ZTO:中通、JD:京东、DBL:德邦、YTO:圆通)",width = 30,sort = 20)
     private String deliverySn;
 
-    @Excel(name = "物流公司",width = 10,sort = 10)
+    @Excel(name = "物流公司",width = 10,sort = 100)
     private String logisticsCompany;
 
     private String deliveryName;
 
-    @Excel(name = "快递单号(必填)",width = 20,sort = 3)
+    @Excel(name = "快递单号(必填)",width = 20,sort = 30)
     private String deliveryId;
 
-    @Excel(name = "物流状态(0:暂无信息、1:已揽收、2:在途中、3:签收、4:问题件)",width = 40,sort = 4)
+    @Excel(name = "物流状态(0:暂无信息、1:已揽收、2:在途中、3:签收、4:问题件)",width = 40,sort = 40)
     private Integer deliveryStatus;
 
-    @Excel(name = "物流结算费用",width = 20,sort = 5)
+    @Excel(name = "物流结算费用",width = 20,sort = 50)
     private BigDecimal deliveryPayMoney;
 
-    @Excel(name = "物流跟踪状态(311:快递柜或驿站签收、304:派件异常后最终签收、301:正常签收、211:已放入快递柜或驿站、202:派件中、201:到达派件城市、401:发货无信息、412:快递柜或驿站超时未取、407:退货未签收)",width = 40,sort = 6)
+    @Excel(name = "物流跟踪状态(311:快递柜或驿站签收、304:派件异常后最终签收、301:正常签收、211:已放入快递柜或驿站、202:派件中、201:到达派件城市、401:发货无信息、412:快递柜或驿站超时未取、407:退货未签收)",width = 40,sort = 60)
     private Integer deliveryType;
 
-    @Excel(name = "物流结算状态(1:已结算、2:冻结、3:解冻、4:退回运费、5.调账)",width = 20,sort = 7)
+    @Excel(name = "物流结算状态(1:已结算、2:冻结、3:解冻、4:退回运费、5.调账)",width = 20,sort = 70)
     private Integer deliveryPayStatus;
 
-    @Excel(name = "快递账单日期",width = 20,sort = 8)
+    @Excel(name = "快递账单日期",width = 20,sort = 80)
     private String deliveryTime;
 
-    @Excel(name = "快递结算日期",width = 20,sort = 9)
+    @Excel(name = "快递结算日期",width = 20,sort = 90)
     private String deliveryPayTime;
 
 //    /**
@@ -52,4 +52,10 @@ public class FsOrderDeliveryNoteDTO {
 //    private Integer deliveryNoteStatus;
 
     private Integer deliveryNoteStatus;
+
+    /**
+     * 虚拟手机号
+     */
+    @Excel(name = "虚拟手机号", width = 30, sort = 45)
+    private String virtualPhone;
 }

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreOrderScrm.java

@@ -386,4 +386,7 @@ public class FsStoreOrderScrm extends BaseEntity
     private Integer projectId;
     // 营期ID
     private Integer periodId;
+
+    //虚拟手机号
+    private String virtualPhone;
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -2774,8 +2774,15 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         FsStoreOrderScrm order = fsStoreOrderMapper.selectFsStoreOrderById(param.getOrderId());
         String lastFourNumber = "";
         if (order.getDeliverySn().equals(ShipperCodeEnum.SF.getValue()) || order.getDeliverySn().equals(ShipperCodeEnum.ZTO.getValue())) {
-            lastFourNumber = order.getUserPhone();
-            if (lastFourNumber.length() == 11) {
+            if("恒春来".equals(cloudHostProper.getCompanyName())
+                    && ObjectUtil.isNotEmpty(lastFourNumber = order.getVirtualPhone())){
+                if (lastFourNumber.contains("-")) {
+                    lastFourNumber = lastFourNumber.substring(0, lastFourNumber.indexOf("-"));
+                }
+                lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
+            }
+            // 原逻辑
+            else if ((lastFourNumber = order.getUserPhone()).length() == 11) {
                 lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
             }
         }

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -90,10 +90,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="serviceFee"    column="service_fee"    />
         <!--<result property="orderMedium"    column="order_medium"    />-->
         <result property="backendEditProductType"    column="backend_edit_product_type"    />
+        <result property="virtualPhone"    column="virtual_phone"    />
     </resultMap>
 
     <sql id="selectFsStoreOrderVo">
-        select id, order_code,service_fee, extend_order_id,pay_order_id,bank_order_id, user_id,order_visit, real_name, user_phone, user_address, cart_id, freight_price, total_num, total_price, total_postage, pay_price, pay_postage,pay_delivery,pay_money, deduction_price, coupon_id, coupon_price, paid, pay_time, pay_type, create_time, update_time, status, refund_status, refund_reason_wap_img, refund_reason_wap_explain, refund_reason_time, refund_reason_wap, refund_reason, refund_price, delivery_sn, delivery_name, delivery_type, delivery_id, gain_integral, use_integral, pay_integral, back_integral, mark, is_del, remark, cost, verify_code, store_id, shipping_type, is_channel, is_remind, is_sys_del,is_prescribe,prescribe_id ,company_id,company_user_id,is_package,package_json,item_json,order_type,package_id,finish_time,delivery_status,delivery_pay_status,delivery_time,delivery_pay_time,delivery_pay_money,tui_money,tui_money_status,delivery_import_time,tui_user_id,tui_user_money_status,order_create_type,store_house_code,dept_id,is_edit_money,customer_id,is_pay_remain,delivery_send_time,certificates,schedule_id,backend_edit_product_type,video_id,course_id,project_id,period_id from fs_store_order_scrm
+        select id, order_code,service_fee, extend_order_id,pay_order_id,bank_order_id, user_id,order_visit, real_name, user_phone, user_address, cart_id, freight_price, total_num, total_price, total_postage, pay_price, pay_postage,pay_delivery,pay_money, deduction_price, coupon_id, coupon_price, paid, pay_time, pay_type, create_time, update_time, status, refund_status, refund_reason_wap_img, refund_reason_wap_explain, refund_reason_time, refund_reason_wap, refund_reason, refund_price, delivery_sn, delivery_name, delivery_type, delivery_id, gain_integral, use_integral, pay_integral, back_integral, mark, is_del, remark, cost, verify_code, store_id, shipping_type, is_channel, is_remind, is_sys_del,is_prescribe,prescribe_id ,company_id,company_user_id,is_package,package_json,item_json,order_type,package_id,finish_time,delivery_status,delivery_pay_status,delivery_time,delivery_pay_time,delivery_pay_money,tui_money,tui_money_status,delivery_import_time,tui_user_id,tui_user_money_status,order_create_type,store_house_code,dept_id,is_edit_money,customer_id,is_pay_remain,delivery_send_time,certificates,schedule_id,backend_edit_product_type,video_id,course_id,project_id,period_id,virtual_phone from fs_store_order_scrm
     </sql>
 
     <select id="selectFsStoreOrderList" parameterType="FsStoreOrderScrm" resultMap="FsStoreOrderResult">
@@ -462,7 +463,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="backendEditProductType != null">backend_edit_product_type = #{backendEditProductType},</if>
             <if test="videoId != null">video_id = #{videoId},</if>
             <if test="courseId != null">course_id = #{courseId},</if>
-
+            <if test="virtualPhone != null">virtual_phone = #{virtualPhone},</if>
         </trim>
         where id = #{id}
     </update>
@@ -1000,6 +1001,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ELSE delivery_status
             END,
 
+            virtual_phone = CASE
+            <foreach collection="list" item="item">
+                WHEN order_code = #{item.orderNumber} THEN #{item.virtualPhone}
+            </foreach>
+            ELSE virtual_phone
+            END,
+
             status = CASE
             WHEN status = 1 THEN 2
             ELSE status