change

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -2131,7 +2131,7 @@ public class Task {
                         //默认全部进入中医院
                         BigDecimal ysyAmount = unConfirmAmt;
                         HuifuOrderConfirm confirm = new HuifuOrderConfirm();
-
+                        confirm.setAppId(storePayment.getAppId());
                         if (order != null) {
                             //获取聚水潭分账商户
                             FsAmountsShareMerchant queryMerchant = new FsAmountsShareMerchant();
@@ -2173,7 +2173,7 @@ public class Task {
                             throw new CustomException("订单生成失败，请重试");
                         }
                         //中医院商户号
-                        confirm.setMainHfId("6666000175632107");
+                        //confirm.setMainHfId("6666000175632107");
                         confirm.setReqSeqId(orderCode);
                         confirm.setTotalAmount(storePayment.getPayMoney());
                         HuifuOrderConfirmResult result = huiFuService.confirmOrder(confirm);

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -803,13 +803,15 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         }
     }
 
-    private void addSopOrderLog(SopUserLogsVo logVo, QwSopTempSetting.Content content, Date sendTime){
+    private void addSopOrderLog(SopUserLogsVo logVo, QwSopTempSetting.Content content, Date sendTime,String exId,String companyUserId){
         SopOrderLog sopOrderLog = new SopOrderLog();
         sopOrderLog.setOrderSendType(content.getOrderSendType());
         sopOrderLog.setSendTime(sendTime);
         sopOrderLog.setCrateTime(DateUtils.getNowDate());
         sopOrderLog.setIsBuy(content.getIsBuy());
         sopOrderLog.setSopId(logVo.getSopId());
+        sopOrderLog.setCompanyUserId(Long.parseLong(companyUserId));
+        sopOrderLog.setExId(Long.parseLong(exId));
         sopOrderLogMapper.insertSopOrderLog(sopOrderLog);
     }
 
@@ -908,7 +910,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
 //                handleTagMessage(sopLogs, content);
                 break;
             case 6:
-                addSopOrderLog(logVo,content,sendTime);
+                addSopOrderLog(logVo,content,sendTime,externalId,companyUserId);
                 break;
             case 7:
                 handleVoiceMessage(sopLogs, content, companyUserId);

fs-service/src/main/java/com/fs/sop/domain/SopOrderLog.java

@@ -26,8 +26,8 @@ public class SopOrderLog extends BaseEntity{
     private String sopId;
 
     /** 会员id */
-    @Excel(name = "会员id")
-    private Long fsUserId;
+    @Excel(name = "外部联系人id")
+    private Long exId;
 
     /** 发送类型 1未购 2已购 3未购升单 4已购升单 */
     @Excel(name = "发送类型 1未购 2已购 3未购升单 4已购升单")
@@ -50,5 +50,8 @@ public class SopOrderLog extends BaseEntity{
     /* 0:未推送 1：已推送 **/
     private Integer status;
 
+    //销售id
+    private Long companyUserId;
+
 
 }

fs-service/src/main/resources/mapper/sop/SopOrderLogMapper.xml

@@ -45,23 +45,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into sop_order_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="sopId != null">sop_id,</if>
-            <if test="fsUserId != null">fs_user_id,</if>
+            <if test="exId != null">ex_id,</if>
             <if test="isBuy != null">is_buy,</if>
             <if test="orderSendType != null">order_send_type,</if>
             <if test="crateTime != null">crate_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="sendTime != null">send_time,</if>
             <if test="status != null">status,</if>
+            <if test="companyUserId != null">company_user_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sopId != null">#{sopId},</if>
-            <if test="fsUserId != null">#{fsUserId},</if>
+            <if test="exId != null">#{exId},</if>
             <if test="isBuy != null">#{isBuy},</if>
             <if test="orderSendType != null">#{orderSendType},</if>
             <if test="crateTime != null">#{crateTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="sendTime != null">#{sendTime},</if>
             <if test="status != null">#{status},</if>
+            <if test="companyUserId != null">#{companyUserId},</if>
          </trim>
     </insert>