优化私人订制方案保存

wisenergy-model/src/main/java/cn/wisenergy/model/dto/AddVipSchemeDto.java

+package cn.wisenergy.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "AddVipSchemeDto")
+public class AddVipSchemeDto {
+    private static final long serialVersionUID =1L;
+    /**
+     * 志愿ids,如'1,2,3,4,5,6...
+     */
+    @ApiModelProperty(value = "志愿ids,如'1,2,3,4,5,6...", name = "ids")
+    private String ids;
+    /**
+     * vip客户id
+     */
+    @ApiModelProperty(value = "vip客户id", name = "userId")
+    private Integer userId;
+    /**
+     * 所选专业名称
+     */
+    @ApiModelProperty(value = "所选专业名称", name = "ids")
+    private String name;
+
+}

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/RefillCardServiceImpl.java

 package cn.wisenergy.service.app.impl;
 
+import cn.hutool.core.date.DateTime;
 import cn.wisenergy.common.utils.*;
 import cn.wisenergy.mapper.CardMapper;
 import cn.wisenergy.mapper.RefillCardMapper;
@@ -22,6 +23,7 @@ import org.springframework.util.StringUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigInteger;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -161,9 +163,7 @@ public class RefillCardServiceImpl implements RefillCardService {
 
             //  设置文件名称
             String fileName = batchNumber;
-
             response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
-
             //  sheet名称
             EasyExcel.write(response.getOutputStream(), ExportCardDto.class).sheet(batchNumber).doWrite(resultBo);
             return R.ok(0,true);

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/WxPayServiceImpl.java

@@ -49,7 +49,7 @@ public class WxPayServiceImpl implements WxPayService {
     //商户id
     @Value("${wxPay.MCH_ID}")
     private String mchid;
-    //商户id
+    //商户密钥
     @Value("${wxPay.PRIVATE_KEY}")
     private String key;
     //小程序appid

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/StaffUserVipController.java

@@ -2,6 +2,7 @@ package cn.wisenergy.web.admin.controller.app;
 
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.Local;
+import cn.wisenergy.model.dto.AddVipSchemeDto;
 import cn.wisenergy.model.dto.StaffAddDto;
 import cn.wisenergy.model.dto.UserInfoDto;
 import cn.wisenergy.model.vo.*;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @Api(tags = "员工端")
@@ -74,18 +76,12 @@ public class StaffUserVipController {
         return schemeService.getListVip(queryVo);
     }
 
-    @ApiOperation(value = "vip客户方案保存", notes = "vip客户方案保存", httpMethod = "GET")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "志愿ids,如'1,2,3,4,5,6...", dataType = "string"),
-            @ApiImplicitParam(name = "userId", value = "vip客户id", dataType = "int"),
-            @ApiImplicitParam(name = "name", value = "所选专业名称", dataType = "string"),
-    }
-    )
-    @GetMapping("/addUserVoluteer")
-    public R<Boolean> addUserVoluteer(String ids,Integer userId,String name) {
-        log.info("volunteer-service[]addUserVoluteer[]getList[]input.param.queryVo:" + ids,userId,name);
-
-        return staffUserVipService.addUserVolunteer(ids,userId,name);
+    @ApiOperation(value = "vip客户方案保存", notes = "vip客户方案保存", httpMethod = "POST")
+    @ApiImplicitParam(name = "addVipSchemeDto", value = "保存方案参数", dataType = "AddVipSchemeDto")
+    @PostMapping("/addUserVoluteer")
+    public R<Boolean> addUserVoluteer(@RequestBody AddVipSchemeDto addVipSchemeDto) {
+        log.info("volunteer-service[]addUserVoluteer[]getList[]input.param.queryVo:" + addVipSchemeDto);
+        return staffUserVipService.addUserVolunteer(addVipSchemeDto.getIds(),addVipSchemeDto.getUserId(),addVipSchemeDto.getName());
     }
 
     @ApiOperation(value = "VIP客户信息Excel导出",notes = "VIP客户信息Excel导出",httpMethod = "POST")