Merge branch 'dev' of maopiao/mp-server into mp-server-test

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/CouponMgrController.java

@@ -287,6 +287,7 @@ public class CouponMgrController extends BaseApiController {
             }
         }
         Coupon coupon = mapperFacade.map(couponParam, Coupon.class);
+        logger.info("coupon---:" + JSONObject.toJSONString(coupon));
         // 1、校验修改代金券是否为当前用户的代金券
         Coupon oldCoupon = couponService.getById(coupon.getCouponId());
         if (null == oldCoupon || null == oldCoupon.getCouponId()) {

mp-service/src/main/java/com/qs/mp/admin/domain/param/CouponParam.java

@@ -121,7 +121,7 @@ public class CouponParam {
   @ApiModelProperty("是否新用户注册发放:0否,1是")
   private Integer isNewUserCoupon;
 
-  @ApiModelProperty(value = "优惠卷详情", required = false)
+  @ApiModelProperty(value = "优惠卷详情")
   private String couponDetail;
 
 }

mp-service/src/main/java/com/qs/mp/admin/service/impl/CouponServiceImpl.java

@@ -162,6 +162,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveCoupon(Coupon coupon, List<CouponTicket> ticketList,List<Long> channelIdList) {
+        logger.info("coupon---:" + JSONObject.toJSONString(coupon));
         boolean res = couponService.save(coupon);
         if (!res) {
             throw new ServiceException("请联系管理员");