Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/Feign/ActivityFeign.java

@@ -22,14 +22,18 @@ public interface ActivityFeign {
     public String led(@RequestParam(value = "userId") Integer userId);
 
     @ApiOperation("单个优惠卷信息")
-    @RequestMapping(value = "/info/{no}", method = RequestMethod.GET)
+    @RequestMapping(value = "/user/info/{no}", method = RequestMethod.GET)
     public UserCouponVo info(@PathVariable(value = "no") String no);
 
     @ApiOperation("优惠卷使用")
-    @RequestMapping(value = "/use", method = RequestMethod.POST)
+    @RequestMapping(value = "/user/use", method = RequestMethod.POST)
     public ObjectRestResponse use(
             @RequestParam(value = "userId") Integer userId,
             @RequestParam(value = "TickerNo") String TickerNo,
             @RequestParam(value = "orderNo") String orderNo);
 
+    @ApiOperation("优惠卷取消使用")
+    @RequestMapping(value = "/user/cancelUse", method = RequestMethod.POST)
+    public ObjectRestResponse cancelUse(@RequestParam(value = "TickerNo",defaultValue ="" ) String TickerNo);
+
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/UserCouponBiz.java

@@ -116,6 +116,30 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         updateSelectiveById(userCoupon);
     }
 
+    //取消使用优惠卷
+    public void cancelTickerNo(String TickerNo){
+        if (StringUtils.isBlank(TickerNo)){
+            log.error("----参数不能为空");
+            return;
+        }
+        Example example=new Example(UserCoupon.class);
+        example.createCriteria().andEqualTo("TickerNo",TickerNo).andEqualTo("isDel",0);
+        List<UserCoupon> list=selectByExample(example);
+        if(list.size()==0){
+            log.error(TickerNo+"----优惠卷不存在");
+            return;
+        }
+        UserCoupon userCoupon=list.get(0);
+       if (userCoupon!=null&&userCoupon.getIsUse()!=1){
+           log.error(TickerNo+"----没有领优惠卷");
+           return;
+       }
+        userCoupon.setIsUse(0);
+        userCoupon.setOrderNo("");
+        userCoupon.setUseTime(0L);
+        updateSelectiveById(userCoupon);
+    }
+
 
 
 

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/UserCouponController.java

@@ -35,6 +35,8 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
     public UserCouponVo info(@PathVariable String no) {
         return baseBiz.getUserCoupon(no);
     }
+
+
     @ApiOperation("优惠卷使用")
     @RequestMapping(value = "/use", method = RequestMethod.POST)
     public ObjectRestResponse use(
@@ -46,6 +48,14 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
         return ObjectRestResponse.succ();
     }
 
+    @ApiOperation("优惠卷取消使用")
+    @RequestMapping(value = "/cancelUse", method = RequestMethod.POST)
+    public ObjectRestResponse cancelUse(
+            @RequestParam(value = "TickerNo",defaultValue ="" ) String TickerNo){
+        baseBiz.cancelTickerNo(TickerNo);
+        return ObjectRestResponse.succ();
+    }
+
 
 
 }
\ No newline at end of file