新增赠送项目是否计算消耗控制

jyy

2021-06-12 393d296e43f0e5f11e524cab5446bcd3eee94e89

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java

@@ -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,9 +94,13 @@
            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")
    @ApiResponses({