|
@@ -698,15 +698,15 @@ public class WmPayOffController {
|
|
|
return R.ok(msgList);
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 手动回调
|
|
|
- *
|
|
|
- * @param input 修改的对象信息
|
|
|
- * @return 结算操作结果
|
|
|
- */
|
|
|
- @SysLog("手动回调")
|
|
|
- @PostMapping("notify-by-oneself")
|
|
|
- public R<Boolean> notifyByOneself (@RequestBody WmScorePackageSettleNote input){
|
|
|
+ /**
|
|
|
+ * 手动回调
|
|
|
+ *
|
|
|
+ * @param input 修改的对象信息
|
|
|
+ * @return 结算操作结果
|
|
|
+ */
|
|
|
+ @SysLog("手动回调")
|
|
|
+ @PostMapping("notify-by-oneself")
|
|
|
+ public R<Boolean> notifyByOneself(@RequestBody WmScorePackageSettleNote input) {
|
|
|
// 开始输出
|
|
|
log.info("===== 手工回调开始 =====");
|
|
|
|
|
@@ -720,25 +720,25 @@ public class WmPayOffController {
|
|
|
String remark = ("手动回调,操作人" + userid);
|
|
|
|
|
|
// 主键id校验,防止异常
|
|
|
- if (null == settleNoteId) {
|
|
|
- R.failed("积分包ID不能为空");
|
|
|
- }
|
|
|
-
|
|
|
- // 信息校验,防止异常
|
|
|
- if (null == notifyTime ||
|
|
|
- null == settleNoteStatus
|
|
|
- ) {
|
|
|
- R.failed("结算修改信息不能为空");
|
|
|
- }
|
|
|
-
|
|
|
- // 校验数据有效性
|
|
|
- // 查询结算中的数据
|
|
|
+ if (null == settleNoteId) {
|
|
|
+ R.failed("积分包ID不能为空");
|
|
|
+ }
|
|
|
+
|
|
|
+ // 信息校验,防止异常
|
|
|
+ if (null == notifyTime ||
|
|
|
+ null == settleNoteStatus
|
|
|
+ ) {
|
|
|
+ R.failed("结算修改信息不能为空");
|
|
|
+ }
|
|
|
+
|
|
|
+ // 校验数据有效性
|
|
|
+ // 查询结算中的数据
|
|
|
List<WmScorePackageSettleNote> settleNoteByidList = wmScorePackageSettleNoteService.getSettleNoteById(input.getId(), 3);
|
|
|
- log.info("结算信息查询:{}",settleNoteByidList.toString());
|
|
|
+ log.info("结算信息查询:{}", settleNoteByidList.toString());
|
|
|
int checkSettleNoteById = settleNoteByidList.size();
|
|
|
- if (0 == checkSettleNoteById) {
|
|
|
- R.failed("修改的目标数据状态异常,不能修改");
|
|
|
- }
|
|
|
+ if (0 == checkSettleNoteById) {
|
|
|
+ R.failed("修改的目标数据状态异常,不能修改");
|
|
|
+ }
|
|
|
|
|
|
// 更新结算数据
|
|
|
boolean updateSettleResult = wmScorePackageSettleNoteService.updateSettleNoteById(settleNoteId, settleNoteStatus, remark);
|
|
@@ -747,7 +747,7 @@ public class WmPayOffController {
|
|
|
log.info("===== 手工回调开始 =====");
|
|
|
|
|
|
// 返回更新结果
|
|
|
- return R.ok(updateSettleResult);
|
|
|
+ return R.ok(updateSettleResult);
|
|
|
}
|
|
|
|
|
|
}
|