From c1cb25ff1c05f90858aaef8cb12ccade4c36dba7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 22 Dec 2020 17:45:53 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
index 0847e89..457a54a 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
@@ -2,12 +2,17 @@
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
+import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
+import com.matrix.system.app.dto.AddVipDto;
import com.matrix.system.app.dto.VipInfoListDto;
import com.matrix.system.app.vo.VipInfoListVo;
import com.matrix.system.app.vo.VipInfoVo;
+import com.matrix.system.common.bean.CustomerDataDictionary;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.dao.CustomerDataDictionaryDao;
import com.matrix.system.common.tools.DataAuthUtil;
+import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.bean.SysVipLevel;
import com.matrix.system.hive.service.SysVipInfoService;
import com.matrix.system.hive.service.SysVipLevelService;
@@ -16,6 +21,7 @@
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -27,7 +33,7 @@
@Api(value = "ApiVipInfoAction", tags = "会员接口类")
@RestController
@RequestMapping(value = "/api/vip")
-public class ApiVipInfoAction {
+public class ApiVipInfoAction extends BaseController {
@Autowired
private SysVipInfoService sysVipInfoService;
@@ -35,16 +41,26 @@
@Autowired
private SysVipLevelService sysVipLevelService;
+ @Autowired
+ private CustomerDataDictionaryDao customerDataDictionaryDao;
+
@ApiOperation(value = "获取会员通讯录列表", notes = "获取会员通讯录列表")
@ApiResponses({
@ApiResponse(code = 200, message = "ok", response = VipInfoListVo.class)
})
@PostMapping(value = "/findVipInfoList")
public AjaxResult findVipInfoList(@RequestBody VipInfoListDto vipInfoListDto) {
+ if (StringUtils.isBlank(vipInfoListDto.getSort())) {
+ vipInfoListDto.setSort("zjm");
+ }
+
+ if (StringUtils.isBlank(vipInfoListDto.getOrder())) {
+ vipInfoListDto.setOrder("asc");
+ }
return AjaxResult.buildSuccessInstance(sysVipInfoService.findVipAddressBook(vipInfoListDto));
}
- @ApiOperation(value = "根据id查询用户信息", notes = "根据id查询用户信息")
+ @ApiOperation(value = "根据id查询用户信息(通讯录及个人中心)", notes = "根据id查询用户信息")
@ApiResponses({
@ApiResponse(code = 200, message = "ok", response = VipInfoVo.class)
})
@@ -54,6 +70,12 @@
VipInfoVo vipInfoVo = sysVipInfoService.findApiVipInfoById(id);
ajaxResult.putInMap("vipInfo", vipInfoVo);
return ajaxResult;
+ }
+
+ @ApiOperation(value = "根据id查询用户详细信息")
+ @GetMapping(value = "/findVipInfoDetailById/{id}")
+ public AjaxResult findVipInfoDetailById(@PathVariable("id") Long id) {
+ return null;
}
@ApiOperation(value = "查询会员类型", notes = "查询会员类型")
@@ -70,4 +92,31 @@
return AjaxResult.buildSuccessInstance(sysVipLevelService.findByModel(sysVipLevel));
}
+
+
+ @ApiOperation(value = "获取到店途径列表", notes = "获取到店途径列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "ok", response = CustomerDataDictionary.class)
+ })
+ @GetMapping(value = "/findArrivalWayList")
+ public AjaxResult findArrivalWayList() {
+ List<CustomerDataDictionary> ddtj = customerDataDictionaryDao.selectByParentCode("DDTJ", getMe().getCompanyId());
+ return AjaxResult.buildSuccessInstance(ddtj);
+ }
+
+ @ApiOperation(value = "添加会员", notes = "添加会员")
+ @PostMapping(value = "/addVip")
+ public AjaxResult addVip(@RequestBody @Validated AddVipDto addVipDto) {
+ int i = sysVipInfoService.apiAddVip(addVipDto);
+ if (i > 0) {
+ return AjaxResult.buildSuccessInstance("新增成功");
+ }
+ return AjaxResult.buildSuccessInstance("新增失败");
+ }
+
+ @ApiOperation(value = "编辑会员", notes = "编辑会员")
+ @PostMapping(value = "/modifyVip")
+ public AjaxResult modifyVip(@RequestBody AddVipDto addVipDto) {
+ return null;
+ }
}
--
Gitblit v1.9.1