|
|
@@ -58,7 +58,7 @@ public class WxCardPayController extends BaseController { |
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
public ResultData cardOrderList(@ModelAttribute WxCardVo wxCardVo, Integer pageNum, Integer pageSize) { |
|
|
public ResultData cardOrderList(@ModelAttribute WxCardVo wxCardVo, Integer pageNum, Integer pageSize) { |
|
|
String ipStr = getIpAddr(); |
|
|
String ipStr = getIpAddr(); |
|
|
logger.info("cardOrderList: " + ipStr); |
|
|
|
|
|
|
|
|
logger.info("cardPay/cardOrderList: " + ipStr); |
|
|
if (wxCardVo == null) wxCardVo = new WxCardVo(); |
|
|
if (wxCardVo == null) wxCardVo = new WxCardVo(); |
|
|
MallUserInfo user = getUser(); |
|
|
MallUserInfo user = getUser(); |
|
|
wxCardVo.setTenantId(user.getTenantId()); |
|
|
wxCardVo.setTenantId(user.getTenantId()); |
|
|
@@ -83,7 +83,7 @@ public class WxCardPayController extends BaseController { |
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
public ResultData cardSpendlist(@ModelAttribute WxCardSpendVo wxCardSpendVo, Integer pageNum, Integer pageSize) { |
|
|
public ResultData cardSpendlist(@ModelAttribute WxCardSpendVo wxCardSpendVo, Integer pageNum, Integer pageSize) { |
|
|
String ipStr = getIpAddr(); |
|
|
String ipStr = getIpAddr(); |
|
|
logger.info("cardSpendlist: " + ipStr); |
|
|
|
|
|
|
|
|
logger.info("cardPay/cardSpendlist: " + ipStr); |
|
|
if (wxCardSpendVo == null) { |
|
|
if (wxCardSpendVo == null) { |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); |
|
|
} |
|
|
} |
|
|
@@ -107,7 +107,7 @@ public class WxCardPayController extends BaseController { |
|
|
@GetMapping("sum") |
|
|
@GetMapping("sum") |
|
|
public ResultData sumCardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend) { |
|
|
public ResultData sumCardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend) { |
|
|
String ipStr = getIpAddr(); |
|
|
String ipStr = getIpAddr(); |
|
|
logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); |
|
|
|
|
|
|
|
|
logger.info("cardPay/sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); |
|
|
if (wxCardSpend == null) { |
|
|
if (wxCardSpend == null) { |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); |
|
|
} |
|
|
} |
|
|
@@ -120,7 +120,7 @@ public class WxCardPayController extends BaseController { |
|
|
@ApiOperation("交易流水导出") |
|
|
@ApiOperation("交易流水导出") |
|
|
@GetMapping("/exportData") |
|
|
@GetMapping("/exportData") |
|
|
public void exportData(@ModelAttribute WxCardSpendVo wxCardSpendVo, HttpServletRequest request, HttpServletResponse response) { |
|
|
public void exportData(@ModelAttribute WxCardSpendVo wxCardSpendVo, HttpServletRequest request, HttpServletResponse response) { |
|
|
logger.info("[" + getIpAddr() + "] WxCardPayController::exportData"); |
|
|
|
|
|
|
|
|
logger.info("[" + getIpAddr() + "] cardPay/exportData"); |
|
|
if (wxCardSpendVo == null) { |
|
|
if (wxCardSpendVo == null) { |
|
|
throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); |
|
|
throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); |
|
|
} |
|
|
} |
|
|
@@ -138,19 +138,17 @@ public class WxCardPayController extends BaseController { |
|
|
wxCardSpendService.exportData(wxCardSpendVo, request, response); |
|
|
wxCardSpendService.exportData(wxCardSpendVo, request, response); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ApiOperation("更新补贴记录") |
|
|
|
|
|
@PostMapping("update") |
|
|
|
|
|
public ResultData update(@RequestBody WxCardSpendVo wxCardSpendVo) { |
|
|
|
|
|
|
|
|
@ApiOperation("更新卡消费支付状态") |
|
|
|
|
|
@PostMapping("/updatePayStatus") |
|
|
|
|
|
public ResultData update(@RequestBody WxCardSpend wxCardSpend) { |
|
|
String ipStr = getIpAddr(); |
|
|
String ipStr = getIpAddr(); |
|
|
logger.info("subsidy/update: " + ipStr + " :" + wxCardSpendVo.toString()); |
|
|
|
|
|
if (wxCardSpendVo == null) { |
|
|
|
|
|
|
|
|
logger.info("cardPay/updatePayStatus: " + ipStr + " :" + wxCardSpend.toString()); |
|
|
|
|
|
if (wxCardSpend == null) { |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); |
|
|
} |
|
|
} |
|
|
MallUserInfo user = getUser(); |
|
|
MallUserInfo user = getUser(); |
|
|
wxCardSpendVo.setTenantId(user.getTenantId()); |
|
|
|
|
|
wxCardSpendVo.setStatus(EnumCardSpendStatus.MANUAL_PAY.getCode()); |
|
|
|
|
|
wxCardSpendVo.setUpdateDate(new Date()); |
|
|
|
|
|
int num = wxCardSpendService.update(wxCardSpendVo); |
|
|
|
|
|
|
|
|
wxCardSpend.setTenantId(user.getTenantId()); |
|
|
|
|
|
int num = wxCardSpendService.update(wxCardSpend); |
|
|
return new ResultData(num); |
|
|
return new ResultData(num); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |