From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java
index 0993ccb..a8a650d 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java
@@ -8,7 +8,6 @@
import com.matrix.component.wechat.externalInterface.weixinUtil.WeixinServiceUtil;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.BasePageQueryDto;
-import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.hive.bean.MoneyCardUse;
@@ -17,6 +16,7 @@
import com.matrix.system.hive.dao.MoneyCardUseFlowDao;
import com.matrix.system.hive.dao.MoneyCardUseV2Dao;
import com.matrix.system.hive.service.CodeService;
+import com.matrix.system.shopXcx.api.dto.MoneyCardUseFlowDto;
import com.matrix.system.shopXcx.api.vo.WxMoneyCardUseVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -58,6 +58,26 @@
@Autowired
CodeService codeService;
+
+
+
+ @ApiOperation(value = "查询会员主卡", notes = "")
+ @GetMapping(value = "/getUserVipCard")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "ok", response = WxMoneyCardUseVO.class)
+ })
+ public AjaxResult getUserVipCard() {
+ SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("vip_id", sysVipInfo.getId());
+ queryWrapper.eq("is_vip_car","Y");
+ MoneyCardUse moneyCardUse = moneyCardUseV2Dao.selectOne(queryWrapper);
+ WxMoneyCardUseVO vo = new WxMoneyCardUseVO();
+ BeanUtils.copyProperties(moneyCardUse, vo);
+ return AjaxResult.buildSuccessInstance(vo);
+ }
+
+
@ApiOperation(value = "查询会员储值卡", notes = "")
@PostMapping(value = "/getUserMoneyCardUseList")
@ApiResponses({
@@ -74,8 +94,12 @@
BeanUtils.copyProperties(item, vo);
return vo;
}).collect(Collectors.toList());
+ System.out.println(rows.get(0).getId());
return AjaxResult.buildSuccessInstance(rows);
}
+
+
+
@ApiOperation(value = "创建储值卡充值预付单", notes = "传入参数 {rechargeAmount:10} 最少充值1元，最多2位小数 ")
@PostMapping(value = "/createRechargeOrder")
@@ -86,7 +110,7 @@
String rechargeAmount = param.get("rechargeAmount");
if (StringUtils.isBlank(rechargeAmount)) {
- return AjaxResult.buildFailInstance("去输入充值金额");
+ return AjaxResult.buildFailInstance("请输入充值金额");
}
double total = new BigDecimal(rechargeAmount).setScale(2, BigDecimal.ROUND_HALF_DOWN).doubleValue();
if (total < 0.02) {
@@ -135,19 +159,11 @@
@ApiResponses({
@ApiResponse(code = 200, message = "ok", response = MoneyCardUseFlow.class)
})
- public AjaxResult getRechargeList(@RequestBody @Validated BasePageQueryDto pageDto) {
- if(StringUtils.isBlank(pageDto.getKeywords())){
- return AjaxResult.buildFailInstance("keywords参数是必须的");
- }
- PaginationVO pageVo = new PaginationVO();
- pageVo.setOffset((pageDto.getPageNum() - 1) * pageDto.getPageSize());
- pageVo.setLimit(pageDto.getPageSize());
+ public AjaxResult getRechargeList(@RequestBody @Validated MoneyCardUseFlowDto pageDto) {
SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
- MoneyCardUseFlow moneyCardUseFlow=new MoneyCardUseFlow();
- moneyCardUseFlow.setVipId(sysVipInfo.getId());
- moneyCardUseFlow.setCarUseId(Long.parseLong(pageDto.getKeywords()));
- List<MoneyCardUseFlow> dataList = moneyCardUseFlowDao.selectInPage(moneyCardUseFlow, pageVo);
- return AjaxResult.buildSuccessInstance(dataList, moneyCardUseFlowDao.selectTotalRecord(moneyCardUseFlow));
+ pageDto.setCompanyId(sysVipInfo.getCompanyId());
+ List<MoneyCardUseFlow> dataList = moneyCardUseFlowDao.selectForWxInPage(pageDto);
+ return AjaxResult.buildSuccessInstance(dataList);
}
--
Gitblit v1.9.1