浏览代码

短信新接口,后台VIP功能修改发布

花田厝 9 月之前
父节点
当前提交
b170fb30bf

+ 33 - 6
jsjp-admin/src/main/java/com/miaxis/app/controller/userInfo/UserSmsController.java

@@ -9,6 +9,7 @@ import com.miaxis.common.utils.PrivateKeyUtil;
 import com.miaxis.sms.SendSms;
 import com.miaxis.sms.SendSmsSync;
 import com.miaxis.sms.domain.SmsInfo;
+import com.miaxis.sms.domain.SmsToFzUser;
 import com.miaxis.sms.domain.SmsToUser;
 import com.miaxis.tms.dto.TmsCoachInfoIdDTO;
 import com.miaxis.userInfo.domain.UserVip;
@@ -87,18 +88,44 @@ public class UserSmsController extends BaseController {
         sendSms.sendSms(smsInfo);
 
 
-        SmsInfo smsDown = new SmsInfo();
-        smsDown.setPhone(smsToUser.getPhone());
-        smsDown.setParam(null);
-        smsDown.setSignName("极速驾培");
-        smsDown.setTemplateCode("SMS_463667340");  //下载通知
-        sendSms.sendSms(smsDown);
+//        SmsInfo smsDown = new SmsInfo();
+//        smsDown.setPhone(smsToUser.getPhone());
+//        smsDown.setParam(null);
+//        smsDown.setSignName("极速驾培");
+//        smsDown.setTemplateCode("SMS_463667340");  //下载通知
+//        sendSms.sendSms(smsDown);
 
         return Response.success();
     }
 
 
 
+    /**
+     * 发送短信至福州四区学员
+     *
+     * @return
+     */
+    @GetMapping(value = "/sendFzSms")
+    @ApiOperation("发送短信至福州四区学员")
+    public Response sendFzSms(SmsToFzUser smsToFzUser) throws Exception {
+
+        String param = "{\"name\":\"" + smsToFzUser.getName() + "\","
+                + "\"schoolName\":\"" + smsToFzUser.getSchoolName() + "\","
+                + "\"principal\":\"" + smsToFzUser.getPrincipal() + "\","
+                + "\"schoolPhone\":\"" + smsToFzUser.getSchoolPhone() + "\","
+                + "\"tmPhone\":\"" + smsToFzUser.getTmPhone() + "\"}";
+
+        SmsInfo smsInfo = new SmsInfo();
+        smsInfo.setPhone(smsToFzUser.getPhone());
+        smsInfo.setParam(param);
+        smsInfo.setSignName("极速驾培");
+        smsInfo.setTemplateCode("SMS_471800077");
+        sendSms.sendSms(smsInfo);
+
+        return Response.success();
+    }
+
+
 
 
 

+ 98 - 0
jsjp-admin/src/main/java/com/miaxis/pc/PcUserVipController.java

@@ -0,0 +1,98 @@
+package com.miaxis.pc;
+
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.userInfo.domain.UserVip;
+import com.miaxis.userInfo.service.IUserVipService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【会员信息】Controller
+ *
+ * @author miaxis
+ * @date 2024-08-15
+ */
+@RestController
+@RequestMapping("/user/vip")
+@Api(tags={"【PC-会员信息】"})
+public class PcUserVipController extends BaseController{
+    @Autowired
+    private IUserVipService userVipService;
+
+    /**
+     * 查询会员信息列表
+     */
+    @GetMapping("/list")
+    @ApiOperation("查询会员信息列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<UserVip> list(@ModelAttribute UserVip userVip){
+        startPage();
+        List<UserVip> list = userVipService.selectUserVipList(userVip);
+        return toResponsePageInfo(list);
+    }
+    
+    /**
+     * 导出会员信息列表
+
+    @GetMapping("/export")
+    @ApiOperation("导出会员信息列表Excel")
+    public Response<String> export(@ModelAttribute UserVip userVip){
+        List<UserVip> list = userVipService.selectUserVipList(userVip);
+        ExcelUtil<UserVip> util = new ExcelUtil<UserVip>(UserVip.class);
+        return util.exportExcel(list, "vip");
+    }
+     */
+
+    /**
+     * 获取会员信息详细信息
+     */
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取会员信息详细信息")
+    public Response<UserVip> getInfo(
+            @ApiParam(name = "id", value = "会员信息参数", required = true)
+            @PathVariable("id") Integer id
+    ){
+        return Response.success(userVipService.getById(id));
+    }
+
+    /**
+     * 新增会员信息
+
+    @PostMapping
+    @ApiOperation("新增会员信息")
+    public Response<Integer> add(@RequestBody UserVip userVip){
+        return toResponse(userVipService.save(userVip) ? 1 : 0);
+    }
+     */
+
+    /**
+     * 修改会员信息
+     */
+    @PutMapping
+    @ApiOperation("修改会员信息")
+    public Response<Integer> edit(@RequestBody UserVip userVip){
+        return toResponse(userVipService.updateById(userVip) ? 1 : 0);
+    }
+
+    /**
+     * 删除会员信息
+     */
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除会员信息")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "会员信息ids参数", required = true)
+            @PathVariable Integer[] ids
+    ){
+        return toResponse(userVipService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+
+}

+ 28 - 11
jsjp-admin/src/test/java/com/miaxis/test/TestSms.java

@@ -1,6 +1,7 @@
 package com.miaxis.test;
 
 import com.miaxis.JsjpApplication;
+import com.miaxis.common.core.domain.Response;
 import com.miaxis.order.dto.QuerySchoolOrderListDTO;
 import com.miaxis.order.service.IOrderInfoService;
 import com.miaxis.order.vo.QuerySchoolOrderDetailedVo;
@@ -30,11 +31,11 @@ public class TestSms {
     @Test
     public void test() throws Exception {
 
-        SmsToUser smsToUser = new SmsToUser();
-        smsToUser.setName("王小日");
-        smsToUser.setIdcard("350181198811231811");
-        smsToUser.setPhone("15060063160");
-        smsToUser.setPassword("123456");
+ //       SmsToUser smsToUser = new SmsToUser();
+  //      smsToUser.setName("王小日");
+  //      smsToUser.setIdcard("350181198811231811");
+  //      smsToUser.setPhone("15060063160");
+   //     smsToUser.setPassword("123456");
 
         //参数处理
 //        String param = "{\"name\":\"" + smsToUser.getName() + "\",\"idcard\":\"" + smsToUser.getIdcard() + "\",\"password\":\"" + smsToUser.getPassword() + "\"}";
@@ -63,12 +64,28 @@ public class TestSms {
 //        sendSms.sendSms(smsInfo);
 
 
-        SmsInfo smsDown = new SmsInfo();
-        smsDown.setPhone(smsToUser.getPhone());
-        smsDown.setParam(null);
-        smsDown.setSignName("极速驾培");
-        smsDown.setTemplateCode("SMS_463667340");  //下载通知
-        sendSms.sendSms(smsDown);
+//        SmsInfo smsDown = new SmsInfo();
+//        smsDown.setPhone(smsToUser.getPhone());
+//        smsDown.setParam(null);
+//        smsDown.setSignName("极速驾培");
+//        smsDown.setTemplateCode("SMS_463667340");  //下载通知
+//        sendSms.sendSms(smsDown);
+
+
+
+
+        String param = "{\"name\":\"" + "小郑" + "\","
+                + "\"schoolName\":\"" + "天安" + "\","
+                + "\"principal\":\"" + "王明" + "\","
+                + "\"schoolPhone\":\"" + "83352681" + "\","
+                + "\"phone\":\"" + 83352682 + "\"}";
+
+        SmsInfo smsInfo = new SmsInfo();
+        smsInfo.setPhone("15060063160");
+        smsInfo.setParam(param);
+        smsInfo.setSignName("极速驾培");
+        smsInfo.setTemplateCode("SMS_471670047");  //帐号密码模板
+        sendSms.sendSms(smsInfo);
 
 
 

+ 37 - 0
jsjp-service/src/main/java/com/miaxis/sms/domain/SmsToFzUser.java

@@ -0,0 +1,37 @@
+package com.miaxis.sms.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户对象 user_info
+ *
+ * @author miaxis
+ * @date 2021-01-11
+ */
+@Data
+public class SmsToFzUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "学员姓名")
+    private String name;
+
+    @ApiModelProperty(value = "驾校简称")
+    private String schoolName;
+
+    @ApiModelProperty(value = "校长姓名")
+    private String principal;
+
+    @ApiModelProperty(value = "驾校电话")
+    private String schoolPhone;
+
+    @ApiModelProperty(value = "运管电话")
+    private String tmPhone;
+
+    @ApiModelProperty(value = "学员电话")
+    private String phone;
+}

+ 1 - 0
jsjp-service/src/main/resources/mapper/userInfo/UserVipMapper.xml

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subject3 != null "> and subject3 = #{subject3}</if>
             <if test="subject4 != null "> and subject4 = #{subject4}</if>
         </where>
+        order by id desc
     </select>