|
|
|
@@ -87,16 +87,9 @@ public class WxCardInfoController extends BaseController { |
|
|
|
map.put("cardType", cardInfo.getType()); |
|
|
|
}else { |
|
|
|
//第一次刷卡的时候没有cardInfo |
|
|
|
WxCoupon cq = new WxCoupon(); |
|
|
|
cq.updateTenantInfo(password); |
|
|
|
cq.setId(password.getCouponId()); |
|
|
|
WxCoupon coupon = wxCouponService.findById(cq); |
|
|
|
if (null == coupon) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "卡未查询到券:"+cardIdStr); |
|
|
|
} |
|
|
|
map.put("cardId", couponPasswordId); |
|
|
|
map.put("amount", coupon.getPrice()); |
|
|
|
map.put("remainAmount", coupon.getPrice()); |
|
|
|
map.put("amount", password.getPrice()); |
|
|
|
map.put("remainAmount", password.getPrice()); |
|
|
|
map.put("cardType", EnumCardInfoType.CARD.getCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
|