diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java index 0bb3490..e154831 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java @@ -74,22 +74,24 @@ public interface VvTradeOrderLineDao extends BaseMapper @OrderBy(VvTradeOrderLineEntity.id_) @GroupBy(VvTradeOrderLineEntity.trade_order_id) List selectByAdminCondition(IPage page, - @IF @IN List tradeOrderIds, + @IF @IN List tradeOrderId, @IF @LIKE String buyerPhone, @IF @LIKE String buyerName, @IF @LIKE String buyerWeixin, - @IF @GE @Column(VvTradeOrderLineEntity.sale_price) BigDecimal minSalePrice, - @IF @LE @Column(VvTradeOrderLineEntity.sale_price) BigDecimal maxSalePrice, + @IF @GE @Column(VvTradeOrderLineEntity.promotion_price) BigDecimal minPromotionPrice, + @IF @LE @Column(VvTradeOrderLineEntity.promotion_price) BigDecimal maxPromotionPrice, @IF String status, @IF Integer settleStatus, @IF @GE @Column(VvTradeOrderLineEntity.create_timestamp) Long minCreateTimestamp, @IF @LE @Column(VvTradeOrderLineEntity.create_timestamp) Long maxCreateTimestamp, @IF @LIKE String productName, + @IF Long productId, @IF Long sellerId, @IF @LIKE String sellerName, @IF Long buyerId, - @IF String reverseStatus, - @IF @OrderBy(VvTradeOrderLineEntity.create_timestamp) String createTimestampSort); + @IF @OrderBy(VvTradeOrderLineEntity.create_timestamp) String createTimestampSort, + @IF @OrderBy(VvTradeOrderLineEntity.modify_timestamp) String modifyTimestampSort + ); @@ -99,19 +101,19 @@ public interface VvTradeOrderLineDao extends BaseMapper @IF @LIKE String buyerPhone, @IF @LIKE String buyerName, @IF @LIKE String buyerWeixin, - @IF @GE @Column(VvTradeOrderLineEntity.sale_price) BigDecimal minSalePrice, - @IF @LE @Column(VvTradeOrderLineEntity.sale_price) BigDecimal maxSalePrice, + @IF @GE @Column(VvTradeOrderLineEntity.promotion_price) BigDecimal minPromotionPrice, + @IF @LE @Column(VvTradeOrderLineEntity.promotion_price) BigDecimal maxPromotionPrice, @IF String status, @IF Integer settleStatus, @IF @GE @Column(VvTradeOrderLineEntity.create_timestamp) Long minCreateTimestamp, @IF @LE @Column(VvTradeOrderLineEntity.create_timestamp) Long maxCreateTimestamp, @IF @LIKE String productName, + @IF Long productId, @IF Long sellerId, @IF @LIKE String sellerName, @IF Long buyerId, - @IF String reverseStatus, - @IF @OrderBy(VvTradeOrderLineEntity.create_timestamp) String createTimestampSort); - + @IF @OrderBy(VvTradeOrderLineEntity.create_timestamp) String createTimestampSort, + @IF @OrderBy(VvTradeOrderLineEntity.modify_timestamp) String modifyTimestampSort); diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVOrderRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVOrderRequest.java index a51e0e1..cde152e 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVOrderRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVOrderRequest.java @@ -28,12 +28,24 @@ public class VVOrderRequest { //总价 - private BigDecimal minSalePrice; + private BigDecimal minPromotionPrice; //总价 - private BigDecimal maxSalePrice; + private BigDecimal maxPromotionPrice; - // + /*** + * create:订单创建 + * wait_pay:待支付 + * wait_shipping:支付完成,待发货 + * shipping:已发货 + * shipped:已投递,比如入到快递柜 + * delivered:已妥投 + * apply_cancel: 买家申请取消订单 + * cancel:卖家同意取消 + * close:买家关闭订单 + * delete:删除 + * refund:已退款 + */ private String status; // 结算状态 @@ -48,6 +60,9 @@ public class VVOrderRequest { //商品名称 , 子单维度 private String productName; + // 商品id + private Long productId; + /*** * 卖家id */ @@ -63,19 +78,12 @@ public class VVOrderRequest { */ private Long buyerId; - /*** - */ - private String reverseStatus; - /** * * 按创建时间排序 , ASC 升序 ,DESC 降序 */ private String createTimestampSort; - - - /** * * 按修改时间排序 , ASC 升序 ,DESC 降序 diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java index 247b42d..58f5910 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java @@ -101,6 +101,7 @@ public class AdminOrderController { /*** * 列表 + * */ @RequestMapping("/list") public R list(@RequestBody VVOrderRequest vvOrderRequest) { @@ -114,18 +115,19 @@ public class AdminOrderController { vvOrderRequest.getBuyerPhone(), vvOrderRequest.getBuyerName(), vvOrderRequest.getBuyerWeixin(), - vvOrderRequest.getMinSalePrice(), - vvOrderRequest.getMaxSalePrice(), + vvOrderRequest.getMinPromotionPrice(), + vvOrderRequest.getMaxPromotionPrice(), vvOrderRequest.getStatus(), vvOrderRequest.getSettleStatus(), vvOrderRequest.getMinCreateTimestamp(), vvOrderRequest.getMaxCreateTimestamp(), vvOrderRequest.getProductName(), + vvOrderRequest.getProductId(), vvOrderRequest.getSellerId(), vvOrderRequest.getSellerName(), vvOrderRequest.getBuyerId(), - vvOrderRequest.getReverseStatus(), - vvOrderRequest.getCreateTimestampSort() + vvOrderRequest.getCreateTimestampSort(), + vvOrderRequest.getModifyTimestampSort() ); } }); @@ -142,7 +144,6 @@ public class AdminOrderController { for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntities) { vvTradeOrderEntities.add(vvTradeOrderEntityMap.get(vvTradeOrderLineEntity.getTradeOrderId())); } - vvOrderRequest.setTradeOrderIds(tradeOrderIds); // 重新获取子单 @@ -151,18 +152,20 @@ public class AdminOrderController { vvOrderRequest.getBuyerPhone(), vvOrderRequest.getBuyerName(), vvOrderRequest.getBuyerWeixin(), - vvOrderRequest.getMinSalePrice(), - vvOrderRequest.getMaxSalePrice(), + vvOrderRequest.getMinPromotionPrice(), + vvOrderRequest.getMaxPromotionPrice(), vvOrderRequest.getStatus(), vvOrderRequest.getSettleStatus(), vvOrderRequest.getMinCreateTimestamp(), vvOrderRequest.getMaxCreateTimestamp(), vvOrderRequest.getProductName(), + vvOrderRequest.getProductId(), vvOrderRequest.getSellerId(), vvOrderRequest.getSellerName(), vvOrderRequest.getBuyerId(), - vvOrderRequest.getReverseStatus(), - vvOrderRequest.getCreateTimestampSort()); + vvOrderRequest.getCreateTimestampSort(), + vvOrderRequest.getModifyTimestampSort() + ); List vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(tradeOrderEntities,list); return R.ok().setData(vvOrderListResps);