添加线下支付金额 订单管理，我的订单，修改订单 审核订单

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

@@ -351,4 +351,7 @@ public class FsStoreOrderScrm extends BaseEntity
     private BigDecimal billPrice;
     private String erpPhone;
 
+    // 线下支付金额
+    private BigDecimal offlinePayAmount;
+
 }

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderAuditVO.java

@@ -102,6 +102,9 @@ public class FsStoreOrderAuditVO {
     /* 订单商品信息 */
     private String itemJson;
 
+    // 线下支付金额
+    private BigDecimal offlinePayAmount;
+
     private List<FsStoreOrderItemVO> items;
 
 }

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderExportVO.java

@@ -89,7 +89,9 @@ public class FsStoreOrderExportVO implements Serializable
     @Excel(name = "物流代收金额",cellType= Excel.ColumnType.NUMERIC)
     private BigDecimal payDelivery;
 
-
+    /** 线下支付金额 */
+    @Excel(name = "线下支付金额",cellType= Excel.ColumnType.NUMERIC)
+    private BigDecimal offlinePayAmount;
 
 
 //    /** 支付邮费 */

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderVO.java

@@ -250,5 +250,8 @@ public class FsStoreOrderVO implements Serializable
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date deliverySendTime;
 
+    // 线下支付金额
+    private BigDecimal offlinePayAmount;
+
 
 }

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

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             fso.user_phone,
             fso.total_price,
             fso.pay_price,
+            fso.offline_pay_amount,
             fso.order_type,
             fso.create_time orderCreateTime,
             fso.mark,

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

@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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 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,offline_pay_amount from fs_store_order_scrm
     </sql>
 
     <select id="selectFsStoreOrderList" parameterType="FsStoreOrderScrm" resultMap="FsStoreOrderResult">
@@ -426,6 +426,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="followTime != null">follow_time = #{followTime},</if>
             <if test="followDoctorId != null">follow_doctor_id = #{followDoctorId},</if>
             <if test="cycle != null">cycle = #{cycle},</if>
+            <if test="offlinePayAmount != null">offline_pay_amount = #{offlinePayAmount},</if>
         </trim>
         where id = #{id}
     </update>