Selaa lähdekoodia

feat: 手动回调v2,代码补充格式化。

QuTong 1 vuosi sitten
vanhempi
commit
ac57662027

+ 27 - 27
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -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);
 	}
 
 }

+ 7 - 5
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmScorePackageSettleNoteService.java

@@ -115,19 +115,21 @@ public interface WmScorePackageSettleNoteService extends IService<WmScorePackage
 	R<?> settleNotify(String streamId, Integer settleStatus, Boolean izSingle);
 
 	/**
-	 * 根据settleNoteId、结算状态查询信息有效性
+	 * 根据settleNoteId、结算状态查询结算信息
 	 *
-	 * @param id 结算id
+	 * @param id               结算id
 	 * @param settleNoteStatus 结算状态
+	 * @return 结算信息
 	 */
-	List<WmScorePackageSettleNote> getSettleNoteById(Integer id,Integer settleNoteStatus);
+	List<WmScorePackageSettleNote> getSettleNoteById(Integer id, Integer settleNoteStatus);
 
 	/**
 	 * 根据settleNoteId修改结算状态
 	 *
-	 * @param id 结算id
+	 * @param id               结算id
 	 * @param settleNoteStatus 结算状态
-	 * @param remark 备注
+	 * @param remark           备注
+	 * @return 操作状态
 	 */
 	boolean updateSettleNoteById(Integer id, Integer settleNoteStatus, String remark);
 }

+ 9 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageSettleNoteServiceImpl.java

@@ -4214,6 +4214,10 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 	/**
 	 * 根据settleNoteId、结算状态查询结算信息
+	 *
+	 * @param id 结算id
+	 * @param settleNoteStatus 结算状态
+	 * @return 结算列表
 	 */
 	@Override
 	public List<WmScorePackageSettleNote> getSettleNoteById (Integer id,Integer settleNoteStatus){
@@ -4224,6 +4228,11 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 	/**
 	 * 根据settleNoteId修改结算状态
+	 *
+	 * @param id 结算id
+	 * @param settleNoteStatus 结算状态
+	 * @param remark 备注
+	 * @return 操作状态
 	 */
 	@Override
 	public boolean updateSettleNoteById(Integer id, Integer settleNoteStatus, String remark) {