fix: 手动回调调整2

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

@@ -742,7 +742,7 @@ public class WmPayOffController {
 		String packageId = settleNoteByidList.get(0).getPackageId();
 
 		// 更新结算数据
-		boolean updateSettleResult = wmScorePackageSettleNoteService.updateSettleNoteById(packageId, settleNoteId, settleNoteStatus, remark);
+		boolean updateSettleResult = wmScorePackageSettleNoteService.updateSettleNoteById(packageId, settleNoteId, settleNoteStatus, remark, notifyTime);
 
 		// 结束输出
 		log.info("===== 手工回调开始 =====");

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

@@ -25,6 +25,7 @@ import com.qunzhixinxi.hnqz.admin.entity.input.SettleNoteStatusOutput;
 import com.qunzhixinxi.hnqz.admin.entity.output.WmTaskSettleNoteOutput;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -126,11 +127,12 @@ public interface WmScorePackageSettleNoteService extends IService<WmScorePackage
 	/**
 	 * 根据settleNoteId修改结算状态
 	 *
-	 * @param packageId		   积分包id
+	 * @param packageId        积分包id
 	 * @param id               结算id
 	 * @param settleNoteStatus 结算状态
 	 * @param remark           备注
+	 * @param notifyTime	   回调时间
 	 * @return 操作状态
 	 */
-	boolean updateSettleNoteById(String packageId, Integer id, Integer settleNoteStatus, String remark);
+	boolean updateSettleNoteById(String packageId, Integer id, Integer settleNoteStatus, String remark, LocalDateTime notifyTime);
 }

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

@@ -4229,14 +4229,15 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 	/**
 	 * 根据settleNoteId修改结算状态
 	 *
-	 * @param packageId		   积分包id
+	 * @param packageId        积分包id
 	 * @param id               结算id
 	 * @param settleNoteStatus 结算状态
 	 * @param remark           备注
+	 * @param notifyTime	   回调时间
 	 * @return 操作状态
 	 */
 	@Override
-	public boolean updateSettleNoteById(String packageId, Integer id, Integer settleNoteStatus, String remark) {
+	public boolean updateSettleNoteById(String packageId, Integer id, Integer settleNoteStatus, String remark, LocalDateTime notifyTime) {
 		// 修改积分包表状态
 		WmScorePackage scorePackage = new WmScorePackage();
 		scorePackage.setId(packageId);
@@ -4246,6 +4247,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		WmScorePackageSettleNote query = new WmScorePackageSettleNote();
 		query.setId(id);
 		query.setSettleNoteStatus(settleNoteStatus);
+		query.setNotifyTime(notifyTime);
 		query.setRemark(remark);
 		return this.updateById(query);
 	}