Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -202,6 +202,9 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
             }
             couponAmout=couponAmout.add(getCouponAmout(couponId,channel,amout));
         }
+        if (couponAmout.compareTo(amout)>0){
+            couponAmout=amout;
+        }
         return couponAmout;
     }