红德堂-积分商品订单实体调整

fs-service/src/main/java/com/fs/his/domain/FsIntegralOrder.java

@@ -59,14 +59,29 @@ public class FsIntegralOrder
     @Excel(name = "原价")
     private BigDecimal otPrice;
 
+    /** 订单总积分 **/
+    private String totalIntegral;
+
+    /** 折扣积分 **/
+    private String discountIntegral;
+
     /** 支付积分 */
     @Excel(name = "支付积分")
     private String integral;
 
+    /** 订单总金额 **/
+    private BigDecimal totalMoney;
+
+    /** 折扣金额 **/
+    private BigDecimal discountMoney;
+
     /** 支付金额 */
     @Excel(name = "支付金额")
     private BigDecimal payMoney;
 
+    /** 用户优惠券 **/
+    private Long userCouponId;
+
     /** 是否支付 0未支付 1已支付 */
     @Excel(name = "是否支付 0未支付 1已支付")
     private Integer isPay;

fs-service/src/main/java/com/fs/his/mapper/FsCouponMapper.java

@@ -99,6 +99,11 @@ public interface FsCouponMapper
     @Update("update fs_coupon set remain_number=number-(select ifnull(count(1),0) from fs_user_coupon uc where uc.coupon_id=#{couponId}) where coupon_id=#{couponId}")
     int updateRemainCount(Long couponId);
 
+    /**
+     * 根据id集合查询优惠卷
+     */
+    List<FsCoupon> selectFsCouponListByIds(@Param("ids") List<Long> ids);
+
     @Select("SELECT c.* FROM fs_coupon c " +
             "INNER JOIN fs_user_coupon uc ON c.coupon_id = uc.coupon_id " +
             "WHERE uc.user_id = #{userId} AND c.coupon_type = #{couponType} AND uc.status = 0 " +

fs-service/src/main/resources/mapper/his/FsIntegralOrderMapper.xml

@@ -13,7 +13,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userAddress"    column="user_address"    />
         <result property="itemJson"    column="item_json"    />
         <result property="integral"    column="integral"    />
+        <result property="totalIntegral"    column="total_integral"    />
+        <result property="discountIntegral"    column="discount_integral"    />
+        <result property="totalMoney"    column="total_money"    />
+        <result property="discountMoney"    column="discount_money"    />
         <result property="payMoney"    column="pay_money"    />
+        <result property="userCouponId"    column="user_coupon_id"    />
         <result property="isPay"    column="is_pay"    />
         <result property="payTime"    column="pay_time"    />
         <result property="payType"    column="pay_type"    />
@@ -26,13 +31,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="barCode"    column="bar_code"    />
         <result property="loginAccount"    column="login_account"    />
-        <result property="couponId"    column="coupon_id"    />
-        <result property="totalPrice"    column="total_price"    />
-        <result property="discountPrice"    column="discount_price"    />
     </resultMap>
 
     <sql id="selectFsIntegralOrderVo">
-        select order_id, order_code, user_id,bar_code, user_name, user_phone, user_address, item_json, integral,pay_money,is_pay,pay_time,pay_type, status, delivery_code, delivery_name, delivery_sn, delivery_time, create_time,qw_user_id,company_user_id,company_id,remark,login_account,coupon_id,total_price,discount_price from fs_integral_order
+        select order_id, order_code, user_id,bar_code, user_name, user_phone, user_address, item_json, integral,total_integral,discount_integral,total_money,discount_money,pay_money,user_coupon_id,is_pay,pay_time,pay_type, status, delivery_code, delivery_name, delivery_sn, delivery_time, create_time,qw_user_id,company_user_id,company_id,remark,login_account from fs_integral_order
     </sql>
 
     <select id="selectFsIntegralOrderList" parameterType="FsIntegralOrder" resultMap="FsIntegralOrderResult">
@@ -42,7 +44,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
             <if test="userPhone != null  and userPhone != ''"> and user_phone = #{userPhone}</if>
             <if test="integral != null  and integral != ''"> and integral = #{integral}</if>
+            <if test="totalIntegral != null  and totalIntegral != ''"> and total_integral = #{totalIntegral}</if>
+            <if test="discountIntegral != null  and discountIntegral != ''"> and discount_integral = #{discountIntegral}</if>
+            <if test="totalMoney != null  and totalMoney != ''"> and total_money = #{totalMoney}</if>
+            <if test="discountMoney != null  and discountMoney != ''"> and discount_money = #{discountMoney}</if>
             <if test="payMoney != null  and payMoney != ''"> and pay_money = #{payMoney}</if>
+            <if test="userCouponId != null  and userCouponId != ''"> and user_coupon_id = #{userCouponId}</if>
             <if test="isPay != null  and isPay != ''"> and is_pay = #{isPay}</if>
             <if test="payTime != null  and payTime != ''"> and pay_time = #{payTime}</if>
             <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
@@ -75,7 +82,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userAddress != null">user_address,</if>
             <if test="itemJson != null">item_json,</if>
             <if test="integral != null">integral,</if>
+            <if test="totalIntegral != null">total_integral,</if>
+            <if test="discountIntegral != null">discount_integral,</if>
+            <if test="totalMoney != null">total_money,</if>
+            <if test="discountMoney != null">discount_money,</if>
             <if test="payMoney != null">pay_money,</if>
+            <if test="userCouponId != null">user_coupon_id,</if>
             <if test="isPay != null">is_pay,</if>
             <if test="payTime != null">pay_time,</if>
             <if test="payType != null">pay_type,</if>
@@ -90,9 +102,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qwUserId != null">qw_user_id,</if>
             <if test="companyUserId != null">company_user_id,</if>
             <if test="companyId != null">company_id,</if>
-            <if test="couponId != null">coupon_id,</if>
-            <if test="totalPrice != null">total_price,</if>
-            <if test="discountPrice != null">discount_price,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">#{orderId},</if>
@@ -103,7 +112,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userAddress != null">#{userAddress},</if>
             <if test="itemJson != null">#{itemJson},</if>
             <if test="integral != null">#{integral},</if>
+            <if test="totalIntegral != null">#{totalIntegral},</if>
+            <if test="discountIntegral != null">#{discountIntegral},</if>
+            <if test="totalMoney != null">#{totalMoney},</if>
+            <if test="discountMoney != null">#{discountMoney},</if>
             <if test="payMoney != null">#{payMoney},</if>
+            <if test="userCouponId != null">#{userCouponId},</if>
             <if test="isPay != null">#{isPay},</if>
             <if test="payTime != null">#{payTime},</if>
             <if test="payType != null">#{payType},</if>
@@ -134,7 +148,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userAddress != null">user_address = #{userAddress},</if>
             <if test="itemJson != null">item_json = #{itemJson},</if>
             <if test="integral != null">integral = #{integral},</if>
+            <if test="totalIntegral != null">total_integral = #{totalIntegral},</if>
+            <if test="discountIntegral != null">discount_integral = #{discountIntegral},</if>
+            <if test="totalMoney != null">total_money = #{totalMoney},</if>
+            <if test="discountMoney != null">discount_money = #{discountMoney},</if>
             <if test="payMoney != null">pay_money = #{payMoney},</if>
+            <if test="userCouponId != null">user_coupon_id = #{userCouponId},</if>
             <if test="isPay != null">is_pay = #{isPay},</if>
             <if test="payTime != null">pay_time = #{payTime},</if>
             <if test="payType != null">pay_type = #{payType},</if>
@@ -147,9 +166,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark = #{remark},</if>
             <if test="barCode != null">bar_code = #{barCode},</if>
             <if test="loginAccount != '' and loginAccount != null">login_account = #{loginAccount},</if>
-            <if test="couponId != null">coupon_id = #{couponId},</if>
-            <if test="totalPrice != null">total_price = #{totalPrice},</if>
-            <if test="discountPrice != null">discount_price = #{discountPrice},</if>
         </trim>
         where order_id = #{orderId}
     </update>