修改优惠券状态

src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfCouponController.java

@@ -44,7 +44,6 @@ public class TbCfCouponController {
     }
     @ApiOperation("获取用户所有优惠券")
     @GetMapping
-
     public Result<UserCouponVo> getUserCoupons() {
         return tbCfCouponService.getUserCoupons();
     }

src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfIssueCouponDao.java

@@ -16,6 +16,7 @@ public interface TbCfIssueCouponDao extends BaseDao<TbCfIssueCouponEntity> {
 
     List<TbCfIssueCouponEntityExtends> queryCouponByUserId(String userId);
 
-    int changeCouponStatus(String userId,String couponId);
+
+
 
 }

src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfOrderDao.java

@@ -48,4 +48,5 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
 
     OrderEntity getOrder(String orderId);
     TbCfCouponEntity queryCouponPrice(String iss_coupon_id);
+
 }

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java

@@ -87,6 +87,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
     @Autowired
     private SpiderService spiderService;
 
+
     @Resource
     private RedisCache<Object> orderRedisCache;
 
@@ -492,6 +493,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
         //使用优惠券
         if (StringUtils.isNotBlank(definiteOrder.getCouponId())) {
             couponUse(definiteOrder.getUserId(), definiteOrder.getCouponId());
+
         }
 
         //把订单放redis中，过期则取消订单 RedisKeyExpirationListener接收
@@ -518,20 +520,20 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
      * @param couponId
      */
     private void couponUse(String userId, String couponId) {
-        //更新领取记录已领取
+       // 更新领取记录已领取
         int res = tbCfTakeCouponDao.updateEnableFlag(userId, couponId, StateConstant.INVALID);
         if (res < 1) {
             logger.error("消费了优惠券，但是在数据表里没有记录！userId:" + userId + ";couponId:" + couponId);
         }
         /**
          * 增加已使用记录
-         */
-        TbCfCouponUseEntity tbCfCouponUse = new TbCfCouponUseEntity();
-        tbCfCouponUse.setUseId(IdUtil.createIdbyUUID());
-        tbCfCouponUse.setCouponId(couponId);
-        tbCfCouponUse.setUserId(userId);
-        tbCfCouponUse.setUseTime(new Date());
-        tbCfCouponUseDao.save(tbCfCouponUse);
+//         */
+//        TbCfCouponUseEntity tbCfCouponUse = new TbCfCouponUseEntity();
+//        tbCfCouponUse.setUseId(IdUtil.createIdbyUUID());
+//        tbCfCouponUse.setCouponId(couponId);
+//        tbCfCouponUse.setUserId(userId);
+//        tbCfCouponUse.setUseTime(new Date());
+//        tbCfCouponUseDao.save(tbCfCouponUse);
 
     }
 
@@ -738,6 +740,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
             TbCfCouponEntity couponEntity = tbCfOrderDao.queryCouponPrice(iss_coupon_id);
             if(couponEntity!=null){
                 tbCfOrder.setCouponPrice(couponEntity.getDeductAmount());
+                tbCfOrder.setCouponId(couponEntity.getCouponId());
             }
         }
         BigDecimal couponPrice = tbCfOrder.getCouponPrice();

src/main/resources/mapper/TbCfIssueCouponDao.xml

@@ -143,6 +143,7 @@
         </set>
         where coupon_issuetable_id = #{couponIssuetableId}
     </update>
+
     <update id="changeCouponStatus" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity">
         UPDATE tb_cf_issue_coupon
         SET enable_flag = 0

src/main/resources/mapper/TbCfTakeCouponDao.xml

@@ -105,7 +105,7 @@
 
     <!--更新是否已经使用-->
 	<update id="updateEnableFlag">
-        update tb_cf_take_coupon set enable_flag=#{enableFlag} where user_id=#{userId} and coupon_id=#{couponId}
+        update tb_cf_issue_coupon set enable_flag=#{enableFlag} where user_id=#{userId} and coupon_id=#{couponId}
     </update>
 
 </mapper>
\ No newline at end of file