bugfix

src/main/java/com/caimei365/order/model/po/CouponRecordPo.java

@@ -13,6 +13,10 @@ public class CouponRecordPo implements Serializable {
     private Integer couponId;
     private Integer payStatus;
     private Integer userId;
+    /**
+     * cm_coupon_redemption_code 兑换码
+     */
+    private String redemptionCode;
     /**
      *  商品兑换优惠券订单id
      */

src/main/resources/mapper/OrderClubMapper.xml

@@ -687,6 +687,7 @@
                 redemptionTime = #{redemptionTime}
             </if>
         </set>
+        where id = #{id}
     </update>
     <select id="FromUnionId" resultType="java.lang.String">
         SELECT unionID
@@ -714,12 +715,12 @@
         WHERE userId = #{userId}
     </select>
     <select id="findCouponRemain" resultType="com.caimei365.order.model.po.CouponRecordPo">
-        select id, couponId, clubCouponId, redemptionTime, status
+        select id, couponId, clubCouponId, redemptionTime, status, redemptionCode
         from cm_coupon_redemption_code
         where couponId = #{couponId}
     </select>
     <select id="findUserName" resultType="com.caimei365.order.model.bo.OrderParamBo">
-        select userName,bindMobile
+        select userName, bindMobile
         from user
         where userId = #{userId}
     </select>

src/main/resources/mapper/PayOrderMapper.xml

@@ -326,9 +326,7 @@
         FROM cm_order_product cop
         LEFT JOIN cm_order co ON cop.orderId = co.orderId
         LEFT JOIN cm_coupon_buyrecord ccb ON ccb.orderId = co.orderId
-        WHERE
-#               cop.productId IN (7619,7620)
-            cop.productId IN (7423,7422)
+        WHERE cop.productId IN (7619,7620)
           AND co.receiptStatus = 3
           AND co.delflag = 0
           AND cop.orderId NOT IN (SELECT orderId FROM cm_coupon_buyrecord WHERE orderId IS NOT NULL)