123

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

@@ -30,10 +30,10 @@ public interface ActivityFeign {
     @RequestMapping(value = "/user/use", method = RequestMethod.POST)
     public BigDecimal use(
             @RequestParam(value = "userId") Integer userId,
-            @RequestParam(value = "TickerNo") String TickerNo,
+            @RequestParam(value = "tickerNo") String tickerNo,
             @RequestParam(value = "orderNo") String orderNo,
             @RequestParam(value = "channel") Integer channel,
-            @RequestParam(value = "amout") BigDecimal amout,
+            @RequestParam(value = "amount") BigDecimal amount,
             @RequestParam(value = "type") Integer type);
 
     @ApiOperation("优惠卷取消使用")

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

@@ -153,7 +153,7 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
             return couponAmout;
         }
         Example example=new Example(UserCoupon.class);
-        example.createCriteria().andEqualTo("TickerNo",TickerNo).andEqualTo("isDel",0);
+        example.createCriteria().andEqualTo("tickerNo",TickerNo).andEqualTo("isDel",0);
         List<UserCoupon> list=selectByExample(example);
         if(list.size()==0){
             log.error(userId+"----已领优惠卷");

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

@@ -37,7 +37,7 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
     @RequestMapping(value = "/coupon/list", method = RequestMethod.GET)
     public ObjectRestResponse list(@RequestParam(value = "type",defaultValue = "0") Integer type,
                                    @RequestParam(value = "channel") Integer channel,
-                                   @RequestParam(value = "amount",defaultValue = "0.00") BigDecimal amount) {
+                                       @RequestParam(value = "amount",defaultValue = "0.00") BigDecimal amount) {
         AppUserDTO userInfo = getUserInfo();
         Integer userId = userInfo.getUserid();
         if(userId==null){
@@ -57,13 +57,13 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
     @RequestMapping(value = "/use", method = RequestMethod.POST)
     public BigDecimal use(
             @RequestParam(value = "userId",defaultValue ="0" ) Integer userId,
-            @RequestParam(value = "TickerNo",defaultValue ="" ) String TickerNo,
+            @RequestParam(value = "tickerNo",defaultValue ="" ) String tickerNo,
             @RequestParam(value = "orderNo",defaultValue ="" ) String orderNo,
             @RequestParam(value = "channel",defaultValue ="1" ) Integer channel,
-            @RequestParam(value = "amout",defaultValue ="0.00" ) BigDecimal amout,
+            @RequestParam(value = "amount",defaultValue ="0.00" ) BigDecimal amount,
             @RequestParam(value = "type",defaultValue ="1" ) Integer type
     ) {
-        return   baseBiz.useTickerNo(userId,TickerNo,orderNo,channel,amout,type);
+        return   baseBiz.useTickerNo(userId,tickerNo,orderNo,channel,amount,type);
     }
 
     @ApiOperation("优惠卷取消使用")