~jiangyouyao/beauty-erp.git

			@@ -2,21 +2,30 @@

			import com.matrix.core.constance.MatrixConstance;
			import com.matrix.core.pojo.AjaxResult;
			import com.matrix.core.pojo.PaginationVO;
			import com.matrix.core.tools.EncrypUtil;
			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.ModifyVipDto;
			import com.matrix.system.app.dto.QuestionAnswerDto;
			import com.matrix.system.app.dto.VipInfoListDto;
			import com.matrix.system.app.vo.VipInfoDetailVo;
			import com.matrix.system.app.vo.VipInfoListVo;
			import com.matrix.system.app.vo.VipInfoVo;
			import com.matrix.system.app.mapper.MoneyCardUseMapper;
			import com.matrix.system.app.mapper.QuestionMapper;
			import com.matrix.system.app.vo.*;
			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.common.tools.PasswordUtil;
			import com.matrix.system.hive.action.BaseController;
			import com.matrix.system.hive.bean.SysVipInfo;
			import com.matrix.system.hive.bean.SysVipLevel;
			import com.matrix.system.hive.action.util.QueryUtil;
			import com.matrix.system.hive.bean.*;
			import com.matrix.system.hive.dao.MoneyCardUseDao;
			import com.matrix.system.hive.dao.VipAnswerDao;
			import com.matrix.system.hive.plugin.util.CollectionUtils;
			import com.matrix.system.hive.service.MoneyCardUseService;
			import com.matrix.system.hive.service.QuestionSerivce;
			import com.matrix.system.hive.service.SysVipInfoService;
			import com.matrix.system.hive.service.SysVipLevelService;
			import io.swagger.annotations.Api;
			@@ -27,6 +36,8 @@
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;

			import java.io.UnsupportedEncodingException;
			import java.security.NoSuchAlgorithmException;
			import java.util.List;

			/**
			@@ -47,6 +58,15 @@
			@Autowired
			private CustomerDataDictionaryDao customerDataDictionaryDao;

			@Autowired
			private MoneyCardUseService moneyCardUseService;

			@Autowired
			private QuestionSerivce questionSerivce;

			@Autowired
			private VipAnswerDao vipAnswerDao;

			@ApiOperation(value = "获取会员通讯录列表", notes = "获取会员通讯录列表")
			@ApiResponses({
			@ApiResponse(code = 200, message = "ok", response = VipInfoListVo.class)
			@@ -60,6 +80,11 @@
			if (StringUtils.isBlank(vipInfoListDto.getOrder())) {
			vipInfoListDto.setOrder("asc");
			}

			int offset = (vipInfoListDto.getPageNum() - 1) * vipInfoListDto.getPageSize();
			int limit = vipInfoListDto.getPageSize();
			vipInfoListDto.setOffset(offset);
			vipInfoListDto.setLimit(limit);
			return AjaxResult.buildSuccessInstance(sysVipInfoService.findVipAddressBook(vipInfoListDto));
			}

			@@ -141,7 +166,62 @@
			if(!DataAuthUtil.hasAllShopAuth()) {
			sysVipInfo.setShopId(user.getShopId());
			}

			QueryUtil.setQueryLimitCom(sysVipInfo);
			return AjaxResult.buildSuccessInstance(sysVipInfoService.findAll(sysVipInfo));
			}

			@ApiOperation(value = "卡项 - 获取会员卡项列表", notes = "卡项 - 获取会员卡项列表")
			@ApiResponses({
			@ApiResponse(code = 200, message = "ok", response = VipCardListVo.class)
			})
			@GetMapping(value = "/findVipCardInfo/{vipId}")
			public AjaxResult findVipCardInfo(@PathVariable("vipId") Long vipId) {
			MoneyCardUse moneyCardUse = new MoneyCardUse();
			moneyCardUse.setVipId(vipId);
			List<MoneyCardUse> list = moneyCardUseService.findVipCardUseInPage(moneyCardUse, null);

			List<VipCardListVo> dataList = MoneyCardUseMapper.INSTANCE.entitiesToCardListVos(list);
			return AjaxResult.buildSuccessInstance(dataList);
			}

			@ApiOperation(value = "会员档案 - 获取客户档案问题", notes = "会员档案 - 获取客户档案问题")
			@ApiResponses({
			@ApiResponse(code = 200, message = "ok", response = QuestionVo.class)
			})
			@GetMapping(value = "/findVipQuestions/{vipId}")
			public AjaxResult findVipQuestions(@PathVariable("vipId") Long vipId) {
			// 获取会员所有的答案,分类型
			List<Question> questions = questionSerivce.findByVipId(vipId);
			AjaxResult result = AjaxResult.buildSuccessInstance("获取成功");
			List<QuestionVo> list = QuestionMapper.INSTANCE.entitiesToVos(questions);
			result.putInMap("questions", list);
			return result;
			}

			@ApiOperation(value = "会员档案 - 提交会员档案", notes = "会员档案 - 提交会员档案")
			@PostMapping(value = "/saveVipQuestionsAnswer")
			public AjaxResult saveVipQuestionsAnswer(@RequestBody QuestionAnswerDto questionAnswerDto) {
			VipAnswer delAnswer = new VipAnswer();
			delAnswer.setVipId(questionAnswerDto.getVipId());
			vipAnswerDao.deleteByModel(delAnswer);
			if (CollectionUtils.isNotEmpty(questionAnswerDto.getItems())) {
			List<VipAnswer> vipAnswers = QuestionMapper.INSTANCE.dtosToVipAnswers(questionAnswerDto.getItems());
			vipAnswerDao.batchInsert(vipAnswers);
			}
			return AjaxResult.buildSuccessInstance("档案更新成功");
			}

			@ApiOperation(value = "用户是否存在资金密码", notes = "用户是否存在资金密码")
			@GetMapping(value = "/isExistFundPassword/{vipId}")
			public AjaxResult isExistFundPassword(@PathVariable(value = "vipId") Long vipId) {
			SysVipInfo vipInfo = sysVipInfoService.findById(vipId);
			AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("获取成功");
			if (StringUtils.isNotBlank(vipInfo.getPassWord())) {
			ajaxResult.putInMap("isExist", true);
			} else {
			ajaxResult.putInMap("isExist", false);
			}

			return ajaxResult;
			}
			}