自考

src/main/java/com/peanut/modules/common/controller/CouponController.java

@@ -29,10 +29,6 @@ public class CouponController {
     private CouponService couponService;
     @Autowired
     private CouponHistoryService couponHistoryService;
-    @Autowired
-    private BuyOrderService buyOrderService;
-    @Autowired
-    private BuyOrderProductService buyOrderProductService;
 
     //优惠卷列表
     @RequestMapping("/getCouponList")
@@ -154,7 +150,15 @@ public class CouponController {
         int couponId = (int)params.get("couponId");
         int userId = (int)params.get("userId");
         int getType = (int)params.get("getType");
-        return couponService.insertCouponHistory(couponId,userId,getType);
+        String remark = params.get("remark").toString();
+        return couponService.insertCouponHistory(couponId,userId,getType,remark);
+    }
+
+    //删除用户优惠卷
+    @RequestMapping("/delCouponHistory")
+    public R delCouponHistory(@RequestBody Map<String,Object> params){
+        couponHistoryService.removeById(params.get("couponHistoryId").toString());
+        return R.ok();
     }
 
     //当前优惠卷可用商品