cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -290,8 +290,7 @@ @ResponseBody @PostMapping("/base/appUser/loginSMSCode") @ApiOperation(value = "短信验证码登录", tags = {"APP-登录注册"}) @ApiImplicitParams({ }) public ResultUtil<String> loginSMSCode(LoginSMSCodeVo loginSMSCodeVo) { try { return appUserService.loginSMSCode(loginSMSCodeVo); cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -16,9 +16,7 @@ import com.dsh.account.util.ResultUtil; import com.dsh.account.util.TokenUtil; import com.dsh.account.util.ToolUtil; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @@ -125,8 +123,8 @@ } @ResponseBody @PostMapping("/student/queryStudentCom") public List<Map<String, Object>> queryStudentCom(@RequestBody Integer id) { List<Map<String, Object>> list = studentService.queryCom(id); cloud-server-account/src/main/java/com/dsh/account/vo/QueryStudentComVO.java
New file @@ -0,0 +1,11 @@ package com.dsh.account.vo; import lombok.Data; import java.util.List; import java.util.Map; @Data public class QueryStudentComVO { private List<Map<String, Object>> res; } cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java
@@ -46,16 +46,10 @@ @TableField("agreementContent") private String agreementContent; /** *协议管理id */ @ApiModelProperty("协议管理id") @TableField("agreementId") private Integer agreementId; @Override protected Serializable pkVal() { return this.id; } } cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminCardVO.java
@@ -9,7 +9,7 @@ @Data @AllArgsConstructor @NoArgsConstructor @ApiModel(value = "惠民卡列表VO") @ApiModel(value = "首页惠民卡列表VO") public class HuiminCardVO { @ApiModelProperty("惠民卡id") cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
@@ -6,7 +6,7 @@ <select id="getHuiminAgreementAndList" resultType="com.dsh.activity.entity.THuiminCard"> select t1.* from t_huimin_card t1 where t1.storeId = #{storeId} and t1.startTime <= now() and t1.endTime >= now() and t1.status = 1 order by t1.sort desc cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java
@@ -1,10 +1,7 @@ package com.dsh.course.feignClient.account; import com.dsh.course.dto.*; import com.dsh.course.feignClient.account.model.QueryAppUser; import com.dsh.course.feignClient.account.model.QueryAppUserVO; import com.dsh.course.feignClient.account.model.QueryByNamePhone; import com.dsh.course.feignClient.account.model.TAppUser; import com.dsh.course.feignClient.account.model.*; import com.dsh.guns.modular.system.model.TStudent; import com.dsh.guns.modular.system.model.dto.GiftSearchDto; import com.dsh.guns.modular.system.model.dto.SelectDto; @@ -35,7 +32,7 @@ @PostMapping("/student/queryStudentCom") List<Map<String, Object>> listCom(@RequestBody Integer id); List<Map<String,Object>> listCom(@RequestBody Integer id); @PostMapping("/student/frozen") cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/QueryStudentComVO.java
New file @@ -0,0 +1,11 @@ package com.dsh.course.feignClient.account.model; import lombok.Data; import java.util.List; import java.util.Map; @Data public class QueryStudentComVO { private List<Map<String, Object>> res; } cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -493,9 +493,7 @@ @RequestMapping("/listcom/{id}") @ResponseBody public List<Map<String,Object>> listcom(@PathVariable("id") Integer id) { List<Map<String,Object>> maps = studentClient.listCom(id); List<Map<String,Object>> maps = studentClient.listCom(id); return maps; }
