Просмотр исходного кода

fix card

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
12565e3226
2 измененных файлов: 12 добавлений и 5 удалений
  1. +7
    -5
      mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java
  2. +5
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java

+ 7
- 5
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<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize);
return new ResultData(page);
}


+ 5
- 0
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);


Загрузка…
Отмена
Сохранить