Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!521

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

@@ -187,6 +187,9 @@ public class MarketingMgrController extends BaseApiController {
     @PostMapping("/data/{id}")
     @PreAuthorize("@ss.hasPermi('business:marketing:queryData')")
     @ApiOperation("活动数据")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "success",response = MarketingUserCodeListVO.class)
+    )
     public TableDataInfo dataInfo(@PathVariable("id") Long id) {
         startPage();
         QueryWrapper<MarketingUserCode> queryWrapper = new QueryWrapper<>();

mp-common/src/main/java/com/qs/mp/common/enums/MarketingStatusEnum.java

@@ -1,5 +1,6 @@
 package com.qs.mp.common.enums;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IEnum;
 import io.swagger.annotations.ApiModel;
 
@@ -40,6 +41,19 @@ public enum MarketingStatusEnum implements IEnum<Integer> {
         return desc;
     }
 
+
+    /**
+     * 重写toString，单个转化成json
+     * @return
+     */
+    @Override
+    public String toString() {
+        JSONObject object = new JSONObject();
+        object.put("value",value);
+        object.put("desc", desc);
+        return object.toString();
+    }
+
     public static MarketingStatusEnum getByValue(Integer value) {
         for (MarketingStatusEnum statusEnum : MarketingStatusEnum.values()) {
             if (statusEnum.getValue().equals(value)) {

mp-service/src/main/java/com/qs/mp/admin/domain/vo/MarketingListVO.java

@@ -1,5 +1,7 @@
 package com.qs.mp.admin.domain.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -45,22 +47,22 @@ public class MarketingListVO {
     public String getStatus() {
 
         if (MarketingStatusEnum.OFF.getValue().equals(this.isOn)) {
-            return MarketingStatusEnum.OFF.getDesc();
+            return MarketingStatusEnum.OFF.toString();
         }
         if (MarketingStatusEnum.CLOSE.getValue().equals(this.isOn)) {
-            return MarketingStatusEnum.CLOSE.getDesc();
+            return MarketingStatusEnum.CLOSE.toString();
         }
 
         Date now = DateUtils.getNowDate();
         if (now.before(this.startTime)) {
-            return MarketingStatusEnum.UNSTART.getDesc();
+            return MarketingStatusEnum.UNSTART.toString();
         }
 
         if (now.after(this.endTime)) {
-            return MarketingStatusEnum.END.getDesc();
+            return MarketingStatusEnum.END.toString();
         }
 
-        return MarketingStatusEnum.START.getDesc();
+        return MarketingStatusEnum.START.toString();
     }
 
 }

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

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -111,6 +112,11 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
         // 保存营销活动
         Marketing marketing = new Marketing();
         BeanUtils.copyProperties(marketingCreateParam, marketing);
+
+        if (StringUtils.isNotBlank(marketingCreateParam.getDescription())) {
+            marketing.setDescription(URLDecoder.decode(marketingCreateParam.getDescription()));
+        }
+
         this.save(marketing);
 
         // 创建奖级和奖品信息
@@ -138,6 +144,11 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
             throw new ServiceException("活动当前状态不支持修改");
         }
 
+
+        if (StringUtils.isNotBlank(marketingUpdateParam.getDescription())) {
+            marketing.setDescription(URLDecoder.decode(marketingUpdateParam.getDescription()));
+        }
+
         // 更新营销活动
         BeanUtils.copyProperties(marketingUpdateParam, marketing);
         this.updateById(marketing);