优化客户信息表制单逻辑

fs-company/src/main/java/com/fs/company/controller/handwrite/HandwriteCollectionController.java

@@ -79,6 +79,18 @@ public class HandwriteCollectionController extends BaseController
         return toAjax(handwriteCollectionService.insertHandwriteCollection(handwriteCollection));
     }
 
+    /**
+     * 新增手写信息采集表并更新商城订单状态
+     */
+    @PostMapping("/addCollectionAndUpdateOrderStatus")
+    public AjaxResult addCollectionAndUpdateOrderStatus(@RequestBody HandwriteCollection handwriteCollection)
+    {
+        //获取当前登录用户
+        Long currentUserId = SecurityUtils.getLoginUser().getUser().getUserId();
+        handwriteCollection.setCompanyUserId(currentUserId);
+        return toAjax(handwriteCollectionService.addCollectionAndUpdateOrderStatus(handwriteCollection));
+    }
+
     /**
      * 修改手写信息采集表
      */

fs-service/src/main/java/com/fs/handwrite/domain/HandwriteCollection.java

@@ -19,7 +19,7 @@ public class HandwriteCollection implements Serializable
 
     /** 主键ID */
     @Excel(name = "主键ID")
-    private Integer id;
+    private Long id;
 
     /** 患者姓名 */
     @Excel(name = "患者姓名")

fs-service/src/main/java/com/fs/handwrite/service/IHandwriteCollectionService.java

@@ -41,6 +41,14 @@ public interface IHandwriteCollectionService
      */
     public int insertHandwriteCollection(HandwriteCollection handwriteCollection);
 
+    /**
+     * 新增手写信息采集表并更新商城订单状态
+     *
+     * @param handwriteCollection 手写信息采集表
+     * @return 结果
+     */
+    public int addCollectionAndUpdateOrderStatus(HandwriteCollection handwriteCollection);
+
     /**
      * 修改手写信息采集表
      * 

fs-service/src/main/java/com/fs/handwrite/service/impl/HandwriteCollectionServiceImpl.java

@@ -3,6 +3,7 @@ package com.fs.handwrite.service.impl;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.exception.CustomException;
+import com.fs.common.utils.DateUtils;
 import com.fs.fastgptApi.param.ChatImgParam;
 import com.fs.fastgptApi.result.ChatDetailTStreamFResult;
 import com.fs.fastgptApi.service.ChatService;
@@ -77,6 +78,28 @@ public class HandwriteCollectionServiceImpl implements IHandwriteCollectionServi
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int addCollectionAndUpdateOrderStatus(HandwriteCollection handwriteCollection)
+    {
+        Date currentTime = DateUtils.getNowDate();
+        handwriteCollection.setCreateTime(currentTime);
+        handwriteCollection.setUpdateTime(currentTime);
+        handwriteCollection.setCreateBy(handwriteCollection.getCompanyUserId());
+        handwriteCollection.setUpdateBy(handwriteCollection.getCompanyUserId());
+        try {
+            handwriteCollectionMapper.insertHandwriteCollection(handwriteCollection);
+        } catch (DuplicateKeyException e) {
+            throw new CustomException("订单号已存在，请勿重复添加");
+        }
+        // 修改商城订单状态并设置手写信息采集主键id
+        FsStoreOrderScrm fsStoreOrder=new FsStoreOrderScrm();
+        fsStoreOrder.setOrderCode(handwriteCollection.getOrderCode());
+        fsStoreOrder.setHandleCollectionId(handwriteCollection.getId());
+        //TODO 需要设置推送订单表的状态为已绑定信息采集标识
+        return storeOrderScrmMapper.updateFsStoreOrderByOrderCode(fsStoreOrder);
+    }
+
     @Override
     public int updateHandwriteCollection(HandwriteCollection handwriteCollection)
     {

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderScrmMapper.java

@@ -1217,6 +1217,7 @@ public interface FsStoreOrderScrmMapper
             "            <if test=\"tuiMoneyStatus != null\">tui_money_status = #{tuiMoneyStatus},</if>\n" +
             "            <if test=\"tuiUserId != null\">tui_user_id = #{tuiUserId},</if>\n" +
             "            <if test=\"orderCreateType != null\">order_create_type = #{orderCreateType},</if>\n" +
+            "            <if test=\"handleCollectionId != null\">handle_collection_id = #{handleCollectionId},</if>\n" +
             "        </trim>\n" +
             "        where order_code = #{orderCode}"+
             "</script>"})