diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index 9845c966d..84198227e 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -205,9 +205,11 @@ public class WxCardPayController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData cardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend, Integer pageNum, Integer pageSize) { - String ipStr = getIpAddr(); - logger.info("list: " + ipStr + " :" + wxCardSpend.toString()); - Long memberId; + if (null == wxCardSpend || wxCardSpend.getCardId() == null) { + return new ResultData(Result.ERROR,"参数错误"); + } + + Long memberId; try { memberId = getMemberId(); } catch (Exception e) { @@ -217,9 +219,9 @@ public class WxCardPayController extends BaseController { } private ResultData cardSpendList(WxCardSpendVo wxCardSpend,Long cUserId,Integer pageNum, Integer pageSize) { - if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); wxCardSpend.updateTenantInfo(getTenantInfo()); - wxCardSpend.setOwnerId(cUserId); + //还需要查询默认用户的,就根据 + //wxCardSpend.setOwnerId(cUserId); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java index a5c1b33ca..d6d4fb60d 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java @@ -241,7 +241,12 @@ public class WxCouponPasswordController extends BaseController { retMap.put("ownerPhone", user.getPhone()); } } + retMap.put("remainAmount", cardInfo.getRemainingAmount()); + }else { + retMap.put("remainAmount", password.getPrice()); } + }else { + retMap.put("remainAmount", password.getPrice()); } return new ResultData(retMap);