BidTask 订单api

poyee-order/pom.xml

@@ -23,5 +23,10 @@
             <artifactId>poyi-service</artifactId>
             <version>4.5.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
-</project>
+</project>

poyee-order/src/main/java/com/tzy/controller/LotOrderController.java

@@ -118,4 +118,13 @@ public class LotOrderController {
         List<LotOrder> lotOrders = lotOrderService.queryPaidOrdersLastThreeDays();
         return OutDTO.ok().put("lotOrders", lotOrders);
     }
+
+    @PostMapping("/querySettlementOrders")
+    @ApiIgnore
+    @ApiVersion(1.0)
+    @ApiOperation("查询保证金结算关联拍品订单")
+    public OutDTO querySettlementOrders(@RequestBody LotOrder lotOrder) {
+        List<LotOrder> lotOrders = lotOrderService.querySettlementOrders(lotOrder);
+        return OutDTO.ok().put("lotOrders", lotOrders);
+    }
 }

poyee-order/src/main/java/com/tzy/mapper/LotOrderMapper.java

@@ -22,4 +22,6 @@ public interface LotOrderMapper {
     int batchTimeoutUnpaidOrders();
 
     List<LotOrder> queryPaidOrdersLastThreeDays();
+
+    List<LotOrder> querySettlementOrders(LotOrder lotOrder);
 }

poyee-order/src/main/java/com/tzy/service/LotOrderService.java

@@ -24,4 +24,6 @@ public interface LotOrderService {
     int batchTimeoutUnpaidOrders();
 
     List<LotOrder> queryPaidOrdersLastThreeDays();
+
+    List<LotOrder> querySettlementOrders(LotOrder lotOrder);
 }

poyee-order/src/main/java/com/tzy/service/impl/LotOrderServiceImpl.java

@@ -180,4 +180,13 @@ public class LotOrderServiceImpl implements LotOrderService {
         fillTimestamp(lotOrders);
         return lotOrders;
     }
+
+    @Override
+    public List<LotOrder> querySettlementOrders(LotOrder lotOrder) {
+        if (lotOrder == null || lotOrder.getUserId() == null
+                || (lotOrder.getLotId() == null && lotOrder.getAuctionId() == null)) {
+            throw new ServiceException(500, "查询结算订单参数不能为空");
+        }
+        return lotOrderMapper.querySettlementOrders(lotOrder);
+    }
 }

poyee-order/src/main/resources/mapper/LotOrderMapper.xml

@@ -99,4 +99,15 @@
           and pay_time >= now() - interval '3 day'
         order by pay_time desc
     </select>
+    <select id="querySettlementOrders" resultMap="lotOrderResultMap" parameterType="com.tzy.entity.LotOrder">
+        <include refid="selectLotOrderSql"/>
+        where user_id = #{userId}
+        <if test="lotId != null">
+            and lot_id = #{lotId}
+        </if>
+        <if test="auctionId != null">
+            and auction_id = #{auctionId}
+        </if>
+        order by create_time desc
+    </select>
 </mapper>