会员商品 优惠卷列表

src/main/resources/mapper/TbActivateInRecordMapper.xml

@@ -39,6 +39,19 @@
         group by tb_activate_in_record.pro_id
     </select>
 
+    <select id="queryVipPro" resultType="com.chaozhanggui.system.cashierservice.entity.vo.UserCouponVo">
+        SELECT tb_product.name                     as detail,
+               0                                   as status,
+               sum(tb_activate_in_record.over_num) as num,
+               2                                   as type
+        FROM tb_activate_in_record
+                 LEFT JOIN tb_product ON tb_activate_in_record.pro_id = tb_product.id
+        WHERE vip_user_id = #{vipUserId}
+          and tb_activate_in_record.shop_id = #{shopId}
+          and num!=0
+        group by tb_activate_in_record.pro_id
+    </select>
+
     <select id="queryByVipIdAndShopIdAndProId" resultType="INTEGER">
         SELECT
             sum(tb_activate_in_record.num)

src/main/resources/mapper/TbActivateOutRecordMapper.xml

@@ -27,6 +27,20 @@
         where id = #{id}
     </select>
 
+
+    <select id="queryVipPro" resultType="com.chaozhanggui.system.cashierservice.entity.vo.UserCouponVo">
+        SELECT tb_product.NAME                AS detail,
+               1                              AS status,
+               tb_activate_out_record.use_num AS num,
+               2                              AS type
+        FROM tb_activate_out_record
+                 LEFT JOIN tb_product ON tb_activate_out_record.pro_id = tb_product.id
+                 LEFT JOIN tb_activate_in_record ON tb_activate_in_record.id = tb_activate_out_record.give_id
+        WHERE vip_user_id = #{vipUserId}
+          AND tb_activate_in_record.shop_id = #{shopId}
+          AND tb_activate_out_record.STATUS = 'closed'
+    </select>
+
     <!--查询指定行数据-->
     <select id="queryAll" resultMap="TbActivateOutRecordMap">
         select

src/main/resources/mapper/TbShopUserMapper.xml

@@ -414,6 +414,10 @@
     select * from tb_shop_user where user_id=#{userId}
   </select>
 
+  <select id="selectVipByUserId" resultMap="BaseResultMap">
+    select * from tb_shop_user where user_id=#{userId} and is_vip = 1
+  </select>
+
     <select id="selectByOpenId" resultType="com.chaozhanggui.system.cashierservice.entity.TbShopUser">
       select * from tb_shop_user where mini_open_id = #{openId}
     </select>

src/main/resources/mapper/TbUserCouponsMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="BaseResultMap" type="com.chaozhanggui.system.cashierservice.entity.TbUserCoupons">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="user_id" jdbcType="VARCHAR" property="userId" />
+    <result column="detail" jdbcType="VARCHAR" property="detail" />
     <result column="coupons_price" jdbcType="DECIMAL" property="couponsPrice" />
     <result column="coupons_amount" jdbcType="DECIMAL" property="couponsAmount" />
     <result column="status" jdbcType="VARCHAR" property="status" />
@@ -13,7 +14,7 @@
     <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, user_id, coupons_price, coupons_amount, status, create_time, update_time, end_time,is_double
+    id, user_id, detail, coupons_price, coupons_amount, status, create_time, update_time, end_time,is_double
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -21,6 +22,21 @@
     from tb_user_coupons
     where id = #{id,jdbcType=INTEGER}
   </select>
+
+  <select id="queryAllSelective" resultMap="BaseResultMap">
+    select
+        detail,coupons_price as couponsPrice,coupons_amount as couponsAmount,status,1 as num,0 as type
+    from tb_user_coupons
+    <where>
+      <if test="userId != null and userId != ''">
+        and user_id = #{userId}
+      </if>
+      <if test="status != null and status != ''">
+        and status = #{status}
+      </if>
+    </where>
+  </select>
+
   <select id="selectByUserId" resultType="com.chaozhanggui.system.cashierservice.entity.TbUserCoupons">
     select * from tb_user_coupons where user_id = #{userId}
     <if test="status != null and status != ''">
@@ -44,10 +60,10 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.chaozhanggui.system.cashierservice.entity.TbUserCoupons" useGeneratedKeys="true" keyProperty="id">
-    insert into tb_user_coupons (id, user_id, coupons_price, 
+    insert into tb_user_coupons (id, user_id, detail, coupons_price,
       coupons_amount, status, create_time, 
       update_time, end_time,is_double)
-    values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=VARCHAR}, #{couponsPrice,jdbcType=DECIMAL}, 
+    values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=VARCHAR}, #{detail,jdbcType=VARCHAR}, #{couponsPrice,jdbcType=DECIMAL},
       #{couponsAmount,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{isDouble,jdbcType=VARCHAR})
   </insert>
@@ -60,6 +76,9 @@
       <if test="userId != null">
         user_id,
       </if>
+      <if test="detail != null">
+        detail,
+      </if>
       <if test="couponsPrice != null">
         coupons_price,
       </if>
@@ -86,6 +105,9 @@
       <if test="userId != null">
         #{userId,jdbcType=VARCHAR},
       </if>
+      <if test="detail != null">
+        #{detail,jdbcType=VARCHAR},
+      </if>
       <if test="couponsPrice != null">
         #{couponsPrice,jdbcType=DECIMAL},
       </if>
@@ -112,6 +134,9 @@
       <if test="userId != null">
         user_id = #{userId,jdbcType=VARCHAR},
       </if>
+      <if test="detail != null">
+        detail = #{detail,jdbcType=VARCHAR},
+      </if>
       <if test="couponsPrice != null">
         coupons_price = #{couponsPrice,jdbcType=DECIMAL},
       </if>
@@ -137,6 +162,7 @@
     update tb_user_coupons
     set user_id = #{userId,jdbcType=VARCHAR},
       coupons_price = #{couponsPrice,jdbcType=DECIMAL},
+        detail = #{detail,jdbcType=VARCHAR},
       coupons_amount = #{couponsAmount,jdbcType=DECIMAL},
       status = #{status,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},