|
@@ -63,14 +63,7 @@ import java.io.IOException;
|
|
import java.io.OutputStream;
|
|
import java.io.OutputStream;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
-import java.util.ArrayList;
|
|
|
|
-import java.util.Collections;
|
|
|
|
-import java.util.HashMap;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
-import java.util.Objects;
|
|
|
|
-import java.util.Optional;
|
|
|
|
-import java.util.Set;
|
|
|
|
|
|
+import java.util.*;
|
|
import java.util.concurrent.TimeUnit;
|
|
import java.util.concurrent.TimeUnit;
|
|
import java.util.function.Function;
|
|
import java.util.function.Function;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -705,4 +698,56 @@ public class WmPayOffController {
|
|
return R.ok(msgList);
|
|
return R.ok(msgList);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 手动回调
|
|
|
|
+ *
|
|
|
|
+ * @param input 修改的对象信息
|
|
|
|
+ * @return 结算操作结果
|
|
|
|
+ */
|
|
|
|
+ @SysLog("手动回调")
|
|
|
|
+ @PostMapping("notify-by-oneself")
|
|
|
|
+ public R<Boolean> notifyByOneself (@RequestBody WmScorePackageSettleNote input){
|
|
|
|
+ // 开始输出
|
|
|
|
+ log.info("===== 手工回调开始 =====");
|
|
|
|
+
|
|
|
|
+ // 初始化变量命名
|
|
|
|
+ Integer settleNoteId = input.getId();
|
|
|
|
+ LocalDateTime notifyTime = input.getNotifyTime();
|
|
|
|
+ Integer settleNoteStatus = input.getSettleNoteStatus();
|
|
|
|
+
|
|
|
|
+ // 初始化内部参数
|
|
|
|
+ Integer userid = SecurityUtils.getUser().getId();
|
|
|
|
+ String remark = ("手动回调,操作人" + userid);
|
|
|
|
+
|
|
|
|
+ // 主键id校验,防止异常
|
|
|
|
+ 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());
|
|
|
|
+ int checkSettleNoteById = settleNoteByidList.size();
|
|
|
|
+ if (0 == checkSettleNoteById) {
|
|
|
|
+ R.failed("修改的目标数据状态异常,不能修改");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 更新结算数据
|
|
|
|
+ boolean updateSettleResult = wmScorePackageSettleNoteService.updateSettleNoteById(settleNoteId, settleNoteStatus, remark);
|
|
|
|
+
|
|
|
|
+ // 结束输出
|
|
|
|
+ log.info("===== 手工回调开始 =====");
|
|
|
|
+
|
|
|
|
+ // 返回更新结果
|
|
|
|
+ return R.ok(updateSettleResult);
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|