add

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

@@ -243,7 +243,7 @@ public class Task {
 
 
                 if(ObjectUtil.isNotNull(fsStoreOrder)){
-                    List<FsStorePaymentScrm> fsStorePayments = paymentScrmService.selectFsStorePaymentByOrderScrm(fsStoreOrder.getId());
+                    List<FsStorePaymentScrm> fsStorePayments = paymentScrmService.selectFsStorePaymentByOrderScrmStatus1(fsStoreOrder.getId());
 
 
                     if(CollectionUtils.isNotEmpty(fsStorePayments)){

fs-service/src/main/java/com/fs/his/mapper/FsStorePaymentMapper.java

@@ -10,6 +10,7 @@ import com.fs.his.domain.FsStorePayment;
 import com.fs.his.param.FsStorePaymentParam;
 import com.fs.his.vo.FsStorePaymentExcelVO;
 import com.fs.his.vo.FsStorePaymentVO;
+import com.fs.hisStore.domain.FsStorePaymentScrm;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -317,5 +318,6 @@ public interface FsStorePaymentMapper
     @Select(" select  * from fs_store_payment where status = 0 ")
     List<FsStorePayment> selectAllPayment();
 
-
+    @Select("select * from fs_store_payment_scrm where business_type=2 and order_id=#{orderId} and bank_transaction_id is not null ")
+    List<FsStorePaymentScrm> selectFsStorePaymentByOrderScrmStatus1(Long id);
 }

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

@@ -126,4 +126,5 @@ public interface IFsStorePaymentService
 
     List<FsStorePayment> selectAllPayment();
 
+    List<FsStorePaymentScrm> selectFsStorePaymentByOrderScrmStatus1(Long id);
 }

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

@@ -1399,6 +1399,11 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
         return fsStorePaymentMapper.selectAllPayment();
     }
 
+    @Override
+    public List<FsStorePaymentScrm> selectFsStorePaymentByOrderScrmStatus1(Long id) {
+        return fsStorePaymentMapper.selectFsStorePaymentByOrderScrmStatus1(id);
+    }
+
 
     @Override
     public R paymentByWxaCode(FsStorePaymentPayParam param) {

fs-service/src/main/java/com/fs/wx/mapper/FsWxExpressTaskMapper.java

@@ -73,7 +73,7 @@ public interface FsWxExpressTaskMapper {
      * 查询待处理数据
      * @return
      */
-    @Select("SELECT * FROM fs_wx_express_task WHERE retry_count < 3 AND status in (0,3)")
+    @Select("SELECT * FROM fs_wx_express_task WHERE retry_count < 3 AND status in (0,3) ")
     List<FsWxExpressTask> selectPendingData();
     @Update("<script>" +
             "<foreach collection='list' item='task' separator=';'>" +