支付管理-支付页面查询服务商修改为有效期内的服务商列表

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/controller/HlwSubcontractorController.java

@@ -93,8 +93,6 @@ public class HlwSubcontractorController extends JeecgController<HlwSubcontractor
     }
 
 
-
-
     /**
      * 查询所有没有配置费率的服务商
      *
@@ -110,7 +108,19 @@ public class HlwSubcontractorController extends JeecgController<HlwSubcontractor
     }
 
 
-
+    /**
+     * 查询所有有效期内的服务商
+     *
+     * @param req
+     * @return
+     */
+    @GetMapping(value = "/allListValid")
+    public Result<List<HlwSubcontractor>> allListValid(HttpServletRequest req) {
+        Result<List<HlwSubcontractor>> result = new Result<List<HlwSubcontractor>>();
+        List<HlwSubcontractor> list = hlwSubcontractorService.allListValid();
+        result.setResult(list);
+        return result;
+    }
 
 
     /**

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/mapper/HlwSubcontractorMapper.java

@@ -28,4 +28,6 @@ public interface HlwSubcontractorMapper extends BaseMapper<HlwSubcontractor> {
     List<HlwSubcontractor> userSubList(Page<HlwSubcontractor> page, @Param("applicationId") Integer applicationId, @Param("userCode") String userCode);
 
     List<HlwSubcontractor> findOrderSubList(@Param("orderCode") String orderCode, @Param("applicationId") Integer applicationId);
+
+    List<HlwSubcontractor> allListValid();
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/mapper/xml/HlwSubcontractorMapper.xml

@@ -140,4 +140,17 @@
         left join hlw_payment_detail hpd on hpd.order_id = ho.id and hp.id = hpd.payment_id and hpd.status=3
         group by a.id
     </select>
+
+
+    <select id="allListValid" resultType="org.jeecg.modules.hlwsubcontractor.entity.HlwSubcontractor" >
+        SELECT
+        <include refid="hlwSubcontractorColumns"/>
+        FROM hlw_subcontractor a
+        left join hlw_cp_subcontractor hcs on hcs.subcontractor_id=a.id
+        where
+           hcs.service_rate is not null
+           and TO_DAYS(NOW()) BETWEEN TO_DAYS(hcs.start_date) and TO_DAYS(hcs.end_date)
+        ORDER BY a.id ASC
+    </select>
+
 </mapper>

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/service/IHlwSubcontractorService.java

@@ -26,4 +26,6 @@ public interface IHlwSubcontractorService extends IService<HlwSubcontractor> {
     Page<HlwSubcontractor> userSubList(Page<HlwSubcontractor> page, Integer applicationId, String userCode);
 
     List<HlwSubcontractor> findOrderSubList(String orderCode, Integer applicationId);
+
+    List<HlwSubcontractor> allListValid();
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/service/impl/HlwSubcontractorServiceImpl.java

@@ -49,4 +49,9 @@ public class HlwSubcontractorServiceImpl extends ServiceImpl<HlwSubcontractorMap
     public List<HlwSubcontractor> findOrderSubList(String orderCode, Integer applicationId) {
         return baseMapper.findOrderSubList(orderCode, applicationId);
     }
+
+    @Override
+    public List<HlwSubcontractor> allListValid() {
+        return baseMapper.allListValid();
+    }
 }