Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/CouponsUsedController.java

@@ -75,7 +75,7 @@ public class CouponsUsedController extends WebConfig {
        MallUserInfo mallUserInfo = userInfoService.getById(userId);
        if (StringUtils.isNotBlank(mallUserInfo.getMobile())) {
            LambdaQueryWrapper<BusMarketCouponsUsed> queryWrapper = QueryGenerator.initQueryWrapper(busMarketCouponsUsed, req.getParameterMap()).lambda();
-           queryWrapper.eq(BusMarketCouponsUsed::getUserid, userId);
+           queryWrapper.eq(BusMarketCouponsUsed::getMobile, mallUserInfo.getMobile());
            queryWrapper.eq(BusMarketCouponsUsed::getTenantId, tenantId);
            queryWrapper.eq(BusMarketCouponsUsed::getStatus, 1);
            Page<BusMarketCouponsUsed> page = new Page<BusMarketCouponsUsed>(pageNo, pageSize);

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/MemberCardController.java

@@ -25,6 +25,8 @@ import org.jeecg.modules.business.dto.UserLabelDto;
 import org.jeecg.modules.business.entity.*;
 import org.jeecg.modules.business.service.*;
 import org.jeecg.modules.business.vo.MemberCardStatVo;
+import org.jeecg.modules.mall.entity.MallUserInfo;
+import org.jeecg.modules.wxuser.service.IUserInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -55,6 +57,14 @@ public class MemberCardController extends WebConfig {
 	 private IBusMarketMemberGroupService busMarketMemberGroupService;
 	 @Resource
 	 private IBusMarketMemberLableService busMarketMemberLableService;
+	@Resource
+	private IUserInfoService userInfoService;
+	@Resource
+	private IBusMemberBalanceLogService busMemberBalanceLogService;
+	@Resource
+	private IBusMemberPointLogService busMemberPointLogService;
+	@Resource
+	private IBusMarketRechargeService busMarketRechargeService;
 	/**
 	 * 用户购买的会员卡分页列表查询
 	 *
@@ -123,17 +133,32 @@ public class MemberCardController extends WebConfig {
 	public Result<String> add(@RequestBody BusMemberCard busMemberCard) {
 		String tenantId = TenantContextHolder.getTenantId();
 		String userId = ThirdSessionHolder.getUserId();
-		if (StringUtils.isBlank(userId)) {
-			return Result.error("请先用手机号登录");
+		BusMarketMember busMarketMember = busMarketMemberService.getById(busMemberCard.getGradeId());
+		if (busMarketMember == null) {
+			return Result.error("会员卡不存在！");
 		}
+		if (!busMarketMember.getHotelId().equals(busMemberCard.getHotelId())) {
+			return Result.error("会员卡不存在！");
+		}
+		MallUserInfo mallUserInfo = userInfoService.getById(userId);
 		LambdaQueryWrapper<BusMemberCard> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(BusMemberCard::getTenantId, tenantId);
-		queryWrapper.eq(BusMemberCard::getUserId, userId);
-//		queryWrapper.eq(BusMemberCard::getMobile, busMemberCard.getMobile());
+		queryWrapper.and(t -> {
+			t.eq(BusMemberCard::getUserId, userId);
+			t.or().eq(BusMemberCard::getMobile, mallUserInfo.getMobile());
+		});
 		queryWrapper.eq(BusMemberCard::getHotelId, busMemberCard.getHotelId());
-		Long count = busMemberCardService.count(queryWrapper);
-		if (count > 0) {
-			return Result.error("该账号已绑定会员卡！");
+		BusMemberCard card = busMemberCardService.getOne(queryWrapper);
+		if (card != null) {
+			BusMarketMember member = busMarketMemberService.getById(card.getGradeId());
+			if (member != null) {
+				if (member.getLevel() > busMarketMember.getLevel()) {
+					return Result.error("会员卡不能降级！");
+				}
+				card.setGradeId(busMemberCard.getGradeId());
+				busMemberCardService.updateById(card);
+				return Result.OK("升级成功！");
+			}
 		}
 		busMemberCard.setUserId(userId);
 		busMemberCardService.save(busMemberCard);
@@ -141,4 +166,112 @@ public class MemberCardController extends WebConfig {
 	}
 
 
+	/**
+	 * 会员卡类型列表
+	 * @param busMarketMember
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "会员卡类型列表")
+	@ApiOperation(value="会员卡类型列表", notes="会员卡类型列表")
+	@PostMapping(value = "/member-card-type-list")
+	@ApiLogin
+	@ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
+	public Result<IPage<BusMarketMember>> getMemberCardTypeList(BusMarketMember busMarketMember,
+													  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													  HttpServletRequest req) {
+		String tenantId = TenantContextHolder.getTenantId();
+		LambdaQueryWrapper<BusMarketMember> queryWrapper = QueryGenerator.initQueryWrapper(busMarketMember, req.getParameterMap()).lambda();
+		queryWrapper.eq(BusMarketMember::getTenantId,tenantId);
+		Page<BusMarketMember> page = new Page<BusMarketMember>(pageNo, pageSize);
+		IPage<BusMarketMember> pageList = busMarketMemberService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 * 根据卡片获取对应会员卡余额消费明细列表
+	 * @param busMemberBalanceLog
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "根据卡片获取对应会员卡余额消费明细列表")
+	@ApiOperation(value="根据卡片获取对应会员卡余额消费明细列表", notes="根据卡片获取对应会员卡余额消费明细列表")
+	@PostMapping(value = "/member-card-balance-log-list")
+	@ApiLogin
+	@ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
+	public Result<IPage<BusMemberBalanceLog>> getMemberCardBalanceLogList(BusMemberBalanceLog busMemberBalanceLog,
+																@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																HttpServletRequest req) {
+		String tenantId = TenantContextHolder.getTenantId();
+		LambdaQueryWrapper<BusMemberBalanceLog> queryWrapper = QueryGenerator.initQueryWrapper(busMemberBalanceLog, req.getParameterMap()).lambda();
+		queryWrapper.eq(BusMemberBalanceLog::getTenantId,tenantId);
+		Page<BusMemberBalanceLog> page = new Page<BusMemberBalanceLog>(pageNo, pageSize);
+		IPage<BusMemberBalanceLog> pageList = busMemberBalanceLogService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	@AutoLog(value = "根据卡片获取对应会员卡积分消费明细列表")
+	@ApiOperation(value="根据卡片获取对应会员卡积分消费明细列表", notes="根据卡片获取对应会员卡积分消费明细列表")
+	@PostMapping(value = "/member-card-point-log-list")
+	@ApiLogin
+	@ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
+	public Result<IPage<BusMemberPointLog>> getMemberCardBalanceLogList(BusMemberPointLog busMemberPointLog,
+																		  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																		  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																		  HttpServletRequest req) {
+		String tenantId = TenantContextHolder.getTenantId();
+		LambdaQueryWrapper<BusMemberPointLog> queryWrapper = QueryGenerator.initQueryWrapper(busMemberPointLog, req.getParameterMap()).lambda();
+		queryWrapper.eq(BusMemberPointLog::getTenantId,tenantId);
+		Page<BusMemberPointLog> page = new Page<BusMemberPointLog>(pageNo, pageSize);
+		IPage<BusMemberPointLog> pageList = busMemberPointLogService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 * 获取充值金额选项列表
+	 * @param busMarketRecharge
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "获取充值金额选项列表")
+	@ApiOperation(value="获取充值金额选项列表", notes="获取充值金额选项列表")
+	@PostMapping(value = "/market-recharge-list")
+	@ApiLogin
+	@ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
+	public Result<List<BusMarketRecharge>> getMarketRechargeList(BusMarketRecharge busMarketRecharge,HttpServletRequest req) {
+		String tenantId = TenantContextHolder.getTenantId();
+		LambdaQueryWrapper<BusMarketRecharge> queryWrapper = QueryGenerator.initQueryWrapper(busMarketRecharge, req.getParameterMap()).lambda();
+		queryWrapper.eq(BusMarketRecharge::getTenantId, tenantId);
+		List<BusMarketRecharge> list = busMarketRechargeService.list(queryWrapper);
+		return Result.OK(list);
+	}
+
+	/**
+	 *   会员卡充值余额
+	 *
+	 * @param busMemberBalanceLog
+	 * @return
+	 */
+	@AutoLog(value = "会员卡充值余额")
+	@ApiOperation(value="会员卡充值余额", notes="会员卡充值余额")
+	@PostMapping(value = "/member-card-balance-recharge")
+	@ApiLogin
+	@ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
+	public Result<String> balanceRecharge(@RequestBody BusMemberBalanceLog busMemberBalanceLog) {
+		String tenantId = TenantContextHolder.getTenantId();
+		String userId = ThirdSessionHolder.getUserId();
+		busMemberBalanceLog.setType(1);
+		busMemberBalanceLog.setPayMoney(busMemberBalanceLog.getMoney());
+		busMemberBalanceLog.setPaymentMethod("");
+		busMemberBalanceLog.setTenantId(tenantId);
+		busMemberBalanceLog.setStatus(0);
+		busMemberBalanceLogService.saveBalance(busMemberBalanceLog);
+		return Result.OK("添加成功！");
+	}
 }