update:同步退款

fs-admin/src/main/java/com/fs/his/controller/FsStorePaymentController.java

@@ -122,10 +122,11 @@ public class FsStorePaymentController extends BaseController
 
     @GetMapping(value = "getStatus/{paymentId}")
     public AjaxResult getStatus(@PathVariable("paymentId") Long paymentId,
-                                @RequestParam(value = "refundDate",required = false ) Date refundDate)
+                                @RequestParam(value = "refundDate",required = false ) Date refundDate,
+                                @RequestParam(value = "orgHfSeqId",required = false ) String orgHfSeqId)
     {
 
-        return AjaxResult.success( fsStorePaymentService.updateFsStorePaymentByDecryptForm(paymentId,refundDate));
+        return AjaxResult.success( fsStorePaymentService.updateFsStorePaymentByDecryptForm(paymentId,refundDate,orgHfSeqId));
     }
     @PreAuthorize("@ss.hasPermi('his:storePayment:refund')")
     @GetMapping(value = "refund/{paymentId}")

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -599,7 +599,7 @@ public class Task {
         List<FsStorePayment> fsStorePayments = fsStorePaymentService.selectAllPayment();
         for (FsStorePayment fsStorePayment : fsStorePayments) {
             try{
-                fsStorePaymentService.updateFsStorePaymentByDecryptForm(fsStorePayment.getPaymentId(),null);
+                fsStorePaymentService.updateFsStorePaymentByDecryptForm(fsStorePayment.getPaymentId(),null,null);
             }catch (Exception e){
                 logger.error("同步支付失败："+fsStorePayment.getPaymentId());
             }

fs-service/src/main/java/com/fs/his/service/IFsStorePaymentService.java

@@ -90,7 +90,7 @@ public interface IFsStorePaymentService
 
     List<FsStorePaymentExcelVO> selectFsStorePaymentExcelVO(FsStorePaymentParam fsStorePayment);
 
-    String updateFsStorePaymentByDecryptForm(Long paymentId, Date refundDate);
+    String updateFsStorePaymentByDecryptForm(Long paymentId, Date refundDate,String orgHfSeqId);
 
     R refundFsStorePayment(Long paymentId);
 

fs-service/src/main/java/com/fs/his/service/impl/FsStoreAfterSalesServiceImpl.java

@@ -374,13 +374,15 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService {
                     fsStorePayment.setBusinessCode(newOrderSn);
                     fsStorePaymentMapper.updateFsStorePayment(fsStorePayment);
                 }
+                if (order.getStatus() != 2){
+                    try {
+                        fsStoreOrderService.createOmsOrder(order.getOrderId());
+                    } catch (ParseException e) {
 
-                try {
-                    fsStoreOrderService.createOmsOrder(order.getOrderId());
-                } catch (ParseException e) {
-
+                    }
                 }
 
+
             }
         }
 

fs-service/src/main/java/com/fs/his/service/impl/FsStorePaymentServiceImpl.java

@@ -358,7 +358,7 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
 
     @Override
     @Transactional
-    public String updateFsStorePaymentByDecryptForm(Long paymentId,Date refundDate) {
+    public String updateFsStorePaymentByDecryptForm(Long paymentId,Date refundDate,String orgHfSeqId) {
         FsStorePayment fsStorePayment = fsStorePaymentMapper.selectFsStorePaymentByPaymentId(paymentId);
         if (fsStorePayment != null && fsStorePayment.getStatus() == 1) {
             //退款同步
@@ -368,7 +368,13 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
                 refundQueryRequest.setOrgReqDate(new SimpleDateFormat("yyyyMMdd").format(refundDate));
 //                refundQueryRequest.setOrgReqDate("20260128");
                 //自己传的
-                refundQueryRequest.setOrgReqSeqId("refund-"+fsStorePayment.getPayCode());
+                if (StringUtils.isNotBlank(orgHfSeqId)) {
+                    refundQueryRequest.setOrgHfSeqId(orgHfSeqId);
+                } else {
+                    refundQueryRequest.setOrgReqSeqId("refund-"+fsStorePayment.getPayCode());
+                }
+
+
                 refundQueryRequest.setAppId(fsStorePayment.getAppId());
                 try {
                     HuiFuRefundResult huiFuRefundResult = huiFuService.queryRefundOrder(refundQueryRequest);
@@ -1778,7 +1784,7 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
                         if (fsStorePayment.getCreateTime().before(DateUtils.addDateDay(-20))) {
                             logger.info("定时任务:同步支付状态在20天前,取消同步,payment_id：{}",fsStorePayment.getPaymentId());
                         } else {
-                            updateFsStorePaymentByDecryptForm(fsStorePayment.getPaymentId(),null);
+                            updateFsStorePaymentByDecryptForm(fsStorePayment.getPaymentId(),null,null);
                             //查询是否改为已支付
                             FsStorePayment finalPayment = fsStorePaymentMapper.selectFsStorePaymentByPaymentId(fsStorePayment.getPaymentId());
                             try {