|
|
|
@@ -59,7 +59,12 @@ public class WxCardPayController extends BaseController { |
|
|
|
public ResultData cardOrderList(@ModelAttribute WxCardVo wxCardVo, Integer pageNum, Integer pageSize) { |
|
|
|
String ipStr = getIpAddr(); |
|
|
|
logger.info("cardPay/cardOrderList: " + ipStr); |
|
|
|
if (wxCardVo == null) wxCardVo = new WxCardVo(); |
|
|
|
if (wxCardVo == null) {wxCardVo = new WxCardVo();} |
|
|
|
else { |
|
|
|
if(StringUtils.isBlank(wxCardVo.getOuPhone())) { |
|
|
|
wxCardVo.setOuPhone(null); |
|
|
|
} |
|
|
|
} |
|
|
|
MallUserInfo user = getUser(); |
|
|
|
wxCardVo.setTenantId(user.getTenantId()); |
|
|
|
if(StringUtils.isNotBlank(wxCardVo.getStatusStr())) { |
|
|
|
|