feat: 手动通知

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

@@ -147,6 +147,9 @@ public class FsStorePaymentController extends BaseController
     public R returnPayStatus(@RequestBody FsStorePayment fsStorePayment) throws Exception
     {
         FsStorePayment payment=  fsStorePaymentService.selectFsStorePaymentByTradeNo(fsStorePayment.getTradeNo());
+        if(payment == null) {
+            throw new IllegalArgumentException("该付款记录没有查询到!");
+        }
         String payMode = payment.getPayMode();
         logger.info("手动查询"+payment);
         if (payMode.equals("hf")){
@@ -235,6 +238,7 @@ public class FsStorePaymentController extends BaseController
 
             orderService.payConfirm(1, fsStoreOrder.getId(), payment.getPayCode(),
                     payment.getTradeNo(),body.getChlTrxId(),payment.getTradeNo());
+            return R.ok();
         }
 
         return R.error("请检查外部订单号");

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -3205,13 +3205,13 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         else if(order.getStatus()==1||order.getStatus()==2){
             isAfterSales=1;
         }
-        Integer payment = paymentService.selectFsStorePaymentByOrderIdExists(order.getId());
+//        Integer payment = paymentService.selectFsStorePaymentByOrderIdExists(order.getId());
 
         return R.ok().put("isAfterSales",isAfterSales)
                 .put("order",order)
                 .put("items",list)
                 .put("payLimitTime",payLimitTime)
-                .put("showCancelOrder", (payment==null?0:payment) != 0)
+//                .put("showCancelOrder", (payment==null?0:payment) != 0)
                 .put("prescribe",prescribe);
     }