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

@@ -45,6 +45,7 @@ import io.swagger.annotations.ApiResponses;
 import ma.glasnost.orika.MapperFacade;
 
 import java.math.BigDecimal;
+import java.net.URLDecoder;
 import java.util.*;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
@@ -231,6 +232,8 @@ public class CouponMgrController extends BaseApiController {
             }
         }
         Coupon coupon = mapperFacade.map(couponParam, Coupon.class);
+        String couponDetail = URLDecoder.decode(couponParam.getCouponDetail());
+        coupon.setCouponDetail(couponDetail);
         // 1、校验名称是否重复（代金券表）
         LambdaQueryWrapper<Coupon> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Coupon::getTitle, coupon.getTitle());
@@ -287,7 +290,6 @@ 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/service/impl/CouponServiceImpl.java

@@ -162,7 +162,6 @@ 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("请联系管理员");