Merge remote-tracking branch 'origin/master_feat_ysy_20250929' into master_feat_ysy_20250929

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

@@ -382,4 +382,9 @@ public class FsStoreOrderScrm extends BaseEntity
      * 手写信息采集表(fs_handwrite_collection)的主键id
      * */
     private Long handleCollectionId;
+
+    /**
+     * 收据id
+     */
+    private Long receiptId;
 }

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

@@ -768,6 +768,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             FsStoreOrderScrm storeOrder = new FsStoreOrderScrm();
             //扣减金额
             if (ObjectUtil.isNotNull(param.getReceipt())) {
+                storeOrder.setReceiptId(param.getReceipt().getId());
                 storeOrder.setDeductionPrice(param.getReceipt().getTotalFee());
                 //收款记录更新
                 try {

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

@@ -98,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="appRewardFlag"    column="app_reward_flag"    />
         <result property="companyCustomerId" column="company_customer_id" />
         <result property="handleCollectionId" column="handle_collection_id" />
+        <result property="receiptId" column="receipt_id" />
     </resultMap>
 
     <sql id="selectFsStoreOrderVo">
@@ -112,7 +113,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                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,div_amount, div_huifu_id,zyy_div_amount,zyy_huifu_id,tag_names,erp_type,app_reward_flag,company_customer_id,handle_collection_id from fs_store_order_scrm
+               delivery_send_time,certificates,schedule_id,div_amount, div_huifu_id,zyy_div_amount,zyy_huifu_id,tag_names,erp_type,
+               app_reward_flag,company_customer_id,handle_collection_id,receipt_id from fs_store_order_scrm
     </sql>
 
     <select id="selectFsStoreOrderList" parameterType="FsStoreOrderScrm" resultMap="FsStoreOrderResult">
@@ -279,6 +281,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appRewardFlag != null">app_reward_flag,</if>
             <if test="companyCustomerId != null"> company_customer_id,</if>
             <if test="handleCollectionId != null"> handle_collection_id,</if>
+            <if test="receiptId != null"> receipt_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderCode != null and orderCode != ''">#{orderCode},</if>
@@ -374,6 +377,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appRewardFlag != null">#{appRewardFlag},</if>
             <if test="companyCustomerId != null">#{companyCustomerId},</if>
             <if test="handleCollectionId != null">#{handleCollectionId},</if>
+            <if test="receiptId != null">#{receiptId},</if>
          </trim>
     </insert>
 
@@ -476,6 +480,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appRewardFlag != null and appRewardFlag != ''">app_reward_flag = #{appRewardFlag},</if>
             <if test="companyCustomerId != null "> company_customer_id = #{companyCustomerId},</if>
             <if test="handleCollectionId != null "> handle_collection_id = #{handleCollectionId},</if>
+            <if test="receiptId != null "> receipt_id = #{receiptId},</if>
         </trim>
         where id = #{id}
     </update>