quyixiao/eb-service-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2025-11-14 22:11:59 +08:00
parent f5d98cb24d
commit f025502cf6
3 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java
View File

@ -74,22 +74,24 @@ public interface VvTradeOrderLineDao extends BaseMapper<VvTradeOrderLineEntity>
@OrderBy(VvTradeOrderLineEntity.id_) @OrderBy(VvTradeOrderLineEntity.id_)
@GroupBy(VvTradeOrderLineEntity.trade_order_id) @GroupBy(VvTradeOrderLineEntity.trade_order_id)
List<VvTradeOrderLineEntity> selectByAdminCondition(IPage page, List<VvTradeOrderLineEntity> selectByAdminCondition(IPage page,
@IF @IN List<Long> tradeOrderIds, @IF @IN List<Long> tradeOrderId,
@IF @LIKE String buyerPhone, @IF @LIKE String buyerPhone,
@IF @LIKE String buyerName, @IF @LIKE String buyerName,
@IF @LIKE String buyerWeixin, @IF @LIKE String buyerWeixin,
@IF @GE @Column(VvTradeOrderLineEntity.sale_price) BigDecimal minSalePrice, @IF @GE @Column(VvTradeOrderLineEntity.promotion_price) BigDecimal minPromotionPrice,
@IF @LE @Column(VvTradeOrderLineEntity.sale_price) BigDecimal maxSalePrice, @IF @LE @Column(VvTradeOrderLineEntity.promotion_price) BigDecimal maxPromotionPrice,
@IF String status, @IF String status,
@IF Integer settleStatus, @IF Integer settleStatus,
@IF @GE @Column(VvTradeOrderLineEntity.create_timestamp) Long minCreateTimestamp, @IF @GE @Column(VvTradeOrderLineEntity.create_timestamp) Long minCreateTimestamp,
@IF @LE @Column(VvTradeOrderLineEntity.create_timestamp) Long maxCreateTimestamp, @IF @LE @Column(VvTradeOrderLineEntity.create_timestamp) Long maxCreateTimestamp,
@IF @LIKE String productName, @IF @LIKE String productName,
@IF Long productId,
@IF Long sellerId, @IF Long sellerId,
@IF @LIKE String sellerName, @IF @LIKE String sellerName,
@IF Long buyerId, @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<VvTradeOrderLineEntity>
@IF @LIKE String buyerPhone, @IF @LIKE String buyerPhone,
@IF @LIKE String buyerName, @IF @LIKE String buyerName,
@IF @LIKE String buyerWeixin, @IF @LIKE String buyerWeixin,
@IF @GE @Column(VvTradeOrderLineEntity.sale_price) BigDecimal minSalePrice, @IF @GE @Column(VvTradeOrderLineEntity.promotion_price) BigDecimal minPromotionPrice,
@IF @LE @Column(VvTradeOrderLineEntity.sale_price) BigDecimal maxSalePrice, @IF @LE @Column(VvTradeOrderLineEntity.promotion_price) BigDecimal maxPromotionPrice,
@IF String status, @IF String status,
@IF Integer settleStatus, @IF Integer settleStatus,
@IF @GE @Column(VvTradeOrderLineEntity.create_timestamp) Long minCreateTimestamp, @IF @GE @Column(VvTradeOrderLineEntity.create_timestamp) Long minCreateTimestamp,
@IF @LE @Column(VvTradeOrderLineEntity.create_timestamp) Long maxCreateTimestamp, @IF @LE @Column(VvTradeOrderLineEntity.create_timestamp) Long maxCreateTimestamp,
@IF @LIKE String productName, @IF @LIKE String productName,
@IF Long productId,
@IF Long sellerId, @IF Long sellerId,
@IF @LIKE String sellerName, @IF @LIKE String sellerName,
@IF Long buyerId, @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);

28
api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVOrderRequest.java
View File

@ -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; private String status;
// 结算状态 // 结算状态
@ -48,6 +60,9 @@ public class VVOrderRequest {
//商品名称 , 子单维度 //商品名称 , 子单维度
private String productName; private String productName;
// 商品id
private Long productId;
/*** /***
* 卖家id * 卖家id
*/ */
@ -63,19 +78,12 @@ public class VVOrderRequest {
*/ */
private Long buyerId; private Long buyerId;
/***
*/
private String reverseStatus;
/** /**
* *
* 按创建时间排序 , ASC 升序 ,DESC 降序 * 按创建时间排序 , ASC 升序 ,DESC 降序
*/ */
private String createTimestampSort; private String createTimestampSort;
/** /**
* *
* 按修改时间排序 , ASC 升序 ,DESC 降序 * 按修改时间排序 , ASC 升序 ,DESC 降序

21
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
View File

@ -101,6 +101,7 @@ public class AdminOrderController {
/*** /***
* 列表 * 列表
*
*/ */
@RequestMapping("/list") @RequestMapping("/list")
public R list(@RequestBody VVOrderRequest vvOrderRequest) { public R list(@RequestBody VVOrderRequest vvOrderRequest) {
@ -114,18 +115,19 @@ public class AdminOrderController {
vvOrderRequest.getBuyerPhone(), vvOrderRequest.getBuyerPhone(),
vvOrderRequest.getBuyerName(), vvOrderRequest.getBuyerName(),
vvOrderRequest.getBuyerWeixin(), vvOrderRequest.getBuyerWeixin(),
vvOrderRequest.getMinSalePrice(), vvOrderRequest.getMinPromotionPrice(),
vvOrderRequest.getMaxSalePrice(), vvOrderRequest.getMaxPromotionPrice(),
vvOrderRequest.getStatus(), vvOrderRequest.getStatus(),
vvOrderRequest.getSettleStatus(), vvOrderRequest.getSettleStatus(),
vvOrderRequest.getMinCreateTimestamp(), vvOrderRequest.getMinCreateTimestamp(),
vvOrderRequest.getMaxCreateTimestamp(), vvOrderRequest.getMaxCreateTimestamp(),
vvOrderRequest.getProductName(), vvOrderRequest.getProductName(),
vvOrderRequest.getProductId(),
vvOrderRequest.getSellerId(), vvOrderRequest.getSellerId(),
vvOrderRequest.getSellerName(), vvOrderRequest.getSellerName(),
vvOrderRequest.getBuyerId(), vvOrderRequest.getBuyerId(),
vvOrderRequest.getReverseStatus(), vvOrderRequest.getCreateTimestampSort(),
vvOrderRequest.getCreateTimestampSort() vvOrderRequest.getModifyTimestampSort()
); );
} }
}); });
@ -142,7 +144,6 @@ public class AdminOrderController {
for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntities) { for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntities) {
vvTradeOrderEntities.add(vvTradeOrderEntityMap.get(vvTradeOrderLineEntity.getTradeOrderId())); vvTradeOrderEntities.add(vvTradeOrderEntityMap.get(vvTradeOrderLineEntity.getTradeOrderId()));
} }
vvOrderRequest.setTradeOrderIds(tradeOrderIds); vvOrderRequest.setTradeOrderIds(tradeOrderIds);
// 重新获取子单 // 重新获取子单
@ -151,18 +152,20 @@ public class AdminOrderController {
vvOrderRequest.getBuyerPhone(), vvOrderRequest.getBuyerPhone(),
vvOrderRequest.getBuyerName(), vvOrderRequest.getBuyerName(),
vvOrderRequest.getBuyerWeixin(), vvOrderRequest.getBuyerWeixin(),
vvOrderRequest.getMinSalePrice(), vvOrderRequest.getMinPromotionPrice(),
vvOrderRequest.getMaxSalePrice(), vvOrderRequest.getMaxPromotionPrice(),
vvOrderRequest.getStatus(), vvOrderRequest.getStatus(),
vvOrderRequest.getSettleStatus(), vvOrderRequest.getSettleStatus(),
vvOrderRequest.getMinCreateTimestamp(), vvOrderRequest.getMinCreateTimestamp(),
vvOrderRequest.getMaxCreateTimestamp(), vvOrderRequest.getMaxCreateTimestamp(),
vvOrderRequest.getProductName(), vvOrderRequest.getProductName(),
vvOrderRequest.getProductId(),
vvOrderRequest.getSellerId(), vvOrderRequest.getSellerId(),
vvOrderRequest.getSellerName(), vvOrderRequest.getSellerName(),
vvOrderRequest.getBuyerId(), vvOrderRequest.getBuyerId(),
vvOrderRequest.getReverseStatus(), vvOrderRequest.getCreateTimestampSort(),
vvOrderRequest.getCreateTimestampSort()); vvOrderRequest.getModifyTimestampSort()
);
List<VVOrderListResp> vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(tradeOrderEntities,list); List<VVOrderListResp> vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(tradeOrderEntities,list);
return R.ok().setData(vvOrderListResps); return R.ok().setData(vvOrderListResps);