sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/RemoteContractService.java

@@ -74,6 +74,7 @@ public interface RemoteContractService {
      * @return
      */
     TradeContractGoodsDto queryTradeContractNew(Long entId, Long goodsId, LocalDateTime time);
+    List<Long> queryNewSignGoods(Long entId,  LocalDateTime time);
 
     /**
      * 查询签约的商品

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/dubbo/TradeOrderInfoService.java

@@ -138,13 +138,7 @@ public interface TradeOrderInfoService {
      */
     List<OrderUnitInfoDetailVO> queryOrderUnitInfByTOrderId(Set<Long> tradeOrderId);
 
-    /**
-     * 获取当前企业，已签约的贸易合同对应的商品id
-     *
-     * @param entId
-     * @return
-     */
-    List<Long> querySignGoods(Long entId);
+
 
     /**
      * 查询近期的贸易订单，计算商品的近期销量

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dao/KwcContractTradeMapper.java

@@ -59,8 +59,11 @@ public interface KwcContractTradeMapper extends BaseMapper<KwcContractTrade> {
      * @param goodsId
      * @return
      */
-    TradeContractGoodsDto queryNewSignPrice(@Param("entId") Long entId, @Param("goodsId") Long goodsId, @Param("time")LocalDateTime time);
-    List<Long> querySignTradeContract(@Param("entId") Long entId,  @Param("time")LocalDateTime time);
+    TradeContractGoodsDto queryNewSignPrice(@Param("entId") Long entId, @Param("goodsId") Long goodsId, @Param("time") LocalDateTime time);
+
+    List<Long> queryNewSignGoods(@Param("entId") Long entId, @Param("time") LocalDateTime time);
+
+    List<Long> querySignTradeContract(@Param("entId") Long entId, @Param("time") LocalDateTime time);
 
     List<Long> selectByContract(@Param("contractId") Long contractId);
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -280,6 +280,10 @@ public class RemoteContractServiceImpl implements RemoteContractService {
     public TradeContractGoodsDto queryTradeContractNew(Long entId, Long goodsId, LocalDateTime time) {
         return kwcContractTradeMapper.queryNewSignPrice(entId, goodsId, time);
     }
+   @Override
+    public List<Long> queryNewSignGoods(Long entId, LocalDateTime time) {
+        return kwcContractTradeMapper.queryNewSignGoods(entId,  time);
+    }
 
     @Override
     public List<Long> querySignTradeContract(Long entId, LocalDateTime time) {

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractTradeMapper.xml

@@ -301,6 +301,21 @@
             limit 1
         </where>
     </select>
+    <select id="queryNewSignGoods" resultType="java.lang.Long">
+        select distinct b.goods_id
+        from kwc_contract_trade a
+                 left join kwc_contract_trade_goods b on a.id = b.contract_id and b.del_flag = 0
+                 left join kwc_contract_trade_unit c on a.id = c.contract_id and c.del_flag = 0
+        <where>
+            a.del_flag = 0
+              and a.status = 0
+              and c.unit_type = 2
+              and a.start_time &lt; #{time}
+              and (a.end_time &gt; #{time} OR a.end_time IS NULL)
+              and c.ent_id = #{entId}
+        </where>
+    </select>
+
     <select id="querySignTradeContract" resultType="java.lang.Long">
         select distinct b.goods_id
         from kwc_contract_trade a

sckw-modules/sckw-order/src/main/java/com/sckw/order/dao/KwoTradeOrderMapper.java

@@ -145,7 +145,6 @@ public interface KwoTradeOrderMapper extends BaseMapper<KwoTradeOrder> {
     WorkbenchOrderStsDTO getOrderStsInfo(@Param("query") OrderStsInfoDTO query,
                                          @Param("excludeStatuses") List<Integer> excludeStatuses);
 
-    List<Long> selectGoodsId(@Param("entId") Long entId);
 
     List<OrderSaleVo> querySaleOrder(@Param("start") LocalDateTime start, @Param("end") LocalDateTime end);
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/dubbo/TradeOrderInfoServiceImpl.java

@@ -612,10 +612,6 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
         return orderDetailVo;
     }
 
-    @Override
-    public List<Long> querySignGoods(Long entId) {
-        return kwoTradeOrderService.querySignGoods(entId);
-    }
 
     @Override
     public void orderSettle(TradeOrderSettlePara tradeOrderSettlePara) {

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -1902,9 +1902,7 @@ public class KwoTradeOrderService {
         return buildResult(list, params.getPageSize());
     }
 
-    public List<Long> querySignGoods(Long entId) {
-        return kwoTradeOrderMapper.selectGoodsId(entId);
-    }
+
 
     public List<OrderSaleVo> queryRecentSale(LocalDateTime start, LocalDateTime end) {
         return kwoTradeOrderMapper.querySaleOrder(start, end);

sckw-modules/sckw-order/src/main/resources/mapper/KwoTradeOrderMapper.xml

@@ -714,13 +714,7 @@
         GROUP BY DATE_FORMAT(create_time, #{item.dateFormat});
     </select>
 
-    <select id="selectGoodsId" resultType="java.lang.Long">
-        select distinct ktog.goods_id
-        from kwo_trade_order kto
-                 left join kwo_trade_order_goods ktog on kto.id = ktog.t_order_id and ktog.del_flag = 0
-        where kto.del_flag = 0
-          and kto.ent_id = #{entId}
-    </select>
+
 
     <select id="querySaleOrder" resultType="com.sckw.order.api.model.OrderSaleVo">
         select ktog.goods_id,

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -1026,7 +1026,7 @@ public class KwpGoodsService {
         Long entId = LoginUserHolder.getEntId();
         if (Objects.nonNull(entId)) {
             if (Objects.nonNull(params.getSign())) {//查询签约或未签约商品
-                List<Long> longs = tradeOrderInfoService.querySignGoods(LoginUserHolder.getEntId());
+                List<Long> longs = remoteContractService.queryNewSignGoods(entId, LocalDateTime.now());
                 if (Objects.equals(params.getSign(), 1)) {
                     if (CollUtil.isNotEmpty(longs)) {
                         wrapper.in(KwpGoods::getId, longs);