bugfix

src/main/resources/mapper/SuperVipMapper.xml

@@ -46,7 +46,8 @@
           and delFlag = 0
     </select>
 
-    <insert id="addPayHistory" keyColumn="id" keyProperty="id" parameterType="com.caimei365.user.model.po.VipPayHistoryPo" useGeneratedKeys="true">
+    <insert id="addPayHistory" keyColumn="id" keyProperty="id"
+            parameterType="com.caimei365.user.model.po.VipPayHistoryPo" useGeneratedKeys="true">
         insert into cm_svip_history (userId, packageId, beginTime,
                                      endTime, payStatus, payWay, payType, price,
                                      userBeans, payTime)
@@ -55,7 +56,13 @@
                 #{payTime})
     </insert>
     <update id="updatePayHistory">
-        UPDATE cm_svip_history set payStatus=#{payStatus},payWay=#{payWay},payType=#{payType},beginTime=#{beginTime},endTime=#{endTime},price=#{price}
+        UPDATE cm_svip_history
+        set payStatus=#{payStatus},
+            payWay=#{payWay},
+            payType=#{payType},
+            beginTime=#{beginTime},
+            endTime=#{endTime},
+            price=#{price}
         WHERE id = #{id}
     </update>
     <select id="findUserPackageTime" resultType="java.lang.Integer">
@@ -100,8 +107,9 @@
                cs.payTime,
                csp.duration
         from cm_svip_history cs
-        left join cm_svip_package csp on cs.packageId = csp.id
-        where cs.userId = #{userId} AND cs.payStatus=1
+                 left join cm_svip_package csp on cs.packageId = csp.id
+        where cs.userId = #{userId}
+          AND cs.payStatus = 1
         order by cs.payTime desc
     </select>
 
@@ -125,12 +133,13 @@
         cc.`categoryType`
         FROM cm_coupon cc
         INNER JOIN cm_svip_coupon cs ON cs.couponId = cc.id
+        left join cm_svip_coupon_month cmn on cmn.id = cs.montId
         WHERE cc.delFlag = 0
         AND cc.status != 2
         AND cs.delFlag = 0
-        AND cs.status = 1
+        AND cmn.status = 1
         <if test="useTime != null and useTime != ''">
-            AND cs.useTime=#{useTime}
+            AND cmn.useTime=#{useTime}
         </if>
         ORDER BY cc.startDate DESC
     </select>
@@ -138,17 +147,19 @@
     <select id="findCouponGet" resultType="java.lang.Integer">
         SELECT a.couponId
         FROM cm_coupon_club a
-                 INNER JOIN cm_svip_coupon cs ON a.couponId = cs.couponId
-        WHERE userId = #{userId}
-          AND useTime = #{useTime}
+        INNER JOIN cm_svip_coupon cs ON a.couponId = cs.couponId
+        left join cm_svip_coupon_month cmn on cmn.id = cs.montId
+        WHERE a.userId = #{userId}
+          AND cmn.useTime = #{useTime}
     </select>
 
     <select id="findCouponUse" resultType="java.lang.Integer">
         select ccb.couponId from cm_coupon_club ccb
         inner join cm_svip_coupon cs ON cs.couponId = ccb.couponId
+        left join cm_svip_coupon_month cmn on cmn.id=cs.montId
         where ccb.userId=#{userId} and ccb.status=2 AND ccb.delFlag=0
         <if test="useTime != null and useTime !=''">
-            and cs.useTime=#{useTime}
+            and cmn.useTime=#{useTime}
         </if>
     </select>
 
@@ -165,8 +176,11 @@
     </select>
 
     <select id="getVipHistoryId" resultType="java.lang.Integer">
-        SELECT id FROM cm_svip_history
-        WHERE payStatus=0 AND userId = #{userId} AND packageId=#{packageId}
+        SELECT id
+        FROM cm_svip_history
+        WHERE payStatus = 0
+          AND userId = #{userId}
+          AND packageId = #{packageId}
         ORDER BY id DESC
         LIMIT 1
     </select>