fix: 订单显示待支付，收款显示已支付

fs-service-system/src/main/java/com/fs/store/mapper/FsStorePaymentMapper.java

@@ -372,4 +372,7 @@ public interface FsStorePaymentMapper
      */
     @Select("select * from fs_store_payment where pay_mode='tzbk' and status=0 and trade_no is not null and remark is not null AND create_time < DATE_SUB(NOW(), INTERVAL 10 MINUTE)")
     List<FsStorePayment> queryPendingDelayState();
+
+    @Select("select count(1) from fs_store_payment where order_id=${orderId} limit 1")
+    Integer selectFsStorePaymentByOrderIdExists(Long orderId);
 }

fs-service-system/src/main/java/com/fs/store/service/IFsStorePaymentService.java

@@ -84,6 +84,7 @@ public interface IFsStorePaymentService
 
 
     List<FsStorePayment> selectFsStorePaymentByOrderId(Long orderId);
+    Integer selectFsStorePaymentByOrderIdExists(Long orderId);
 
     Long selectFsStorePaymentCount(int type,Long companyId);
 

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

@@ -3205,7 +3205,14 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         else if(order.getStatus()==1||order.getStatus()==2){
             isAfterSales=1;
         }
-        return R.ok().put("isAfterSales",isAfterSales).put("order",order).put("items",list).put("payLimitTime",payLimitTime).put("prescribe",prescribe);
+        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("prescribe",prescribe);
     }
 
     @Override

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

@@ -231,6 +231,11 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService
         return fsStorePaymentMapper.selectFsStorePaymentByOrderId(orderId);
     }
 
+    @Override
+    public Integer selectFsStorePaymentByOrderIdExists(Long orderId) {
+        return fsStorePaymentMapper.selectFsStorePaymentByOrderIdExists(orderId);
+    }
+
     @Override
     public Long selectFsStorePaymentCount(int type,Long companyId) {
         return fsStorePaymentMapper.selectFsStorePaymentCount(type,companyId);