From 0d66330a49a3cccff40080f3e19fb8eaca88c39c Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 26 Aug 2025 21:26:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heyu/api/data/dao/vv/VvTradeOrderDao.java | 2 - .../data/entity/vv/VvTradeOrderEntity.java | 95 ------------------- .../java/com/test/xxx/MysqlMain_update.java | 2 +- .../api/controller/mm/OrderController.java | 55 +---------- .../api/controller/vv/AppOrderController.java | 11 +-- 5 files changed, 7 insertions(+), 158 deletions(-) diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java index 583708e..2f2d448 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java @@ -58,10 +58,8 @@ public interface VvTradeOrderDao extends BaseMapper { List selectAppByCondition(IPage page, @IF@IN List orderIds, @IF Long buyerId, - @IF String status, @IF @GE Long minCreateTimestamp, @IF@LE Long maxCreateTimestamp, - @IF @NE @Column(VvTradeOrderEntity.status_) String deleteStatus, @IF String createTimestampSort); diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderEntity.java index 973696a..579a77d 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderEntity.java @@ -29,9 +29,7 @@ private static final long serialVersionUID = 1L; public final static String buyer_phone = CLASS_NAME + "buyer_phone"; // 买家手机号 public final static String buyer_name = CLASS_NAME + "buyer_name"; // 买家名 public final static String buyer_weixin = CLASS_NAME + "buyer_weixin"; // 买家微信 - public final static String buyer_address = CLASS_NAME + "buyer_address"; // 买家收货地址 public final static String all_price = CLASS_NAME + "all_price"; // 总价 - public final static String status_ = CLASS_NAME + "status"; // wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered public final static String refund_amount = CLASS_NAME + "refund_amount"; // 退款金额 public final static String refund_count = CLASS_NAME + "refund_count"; // 退货数量 public final static String buyer_id = CLASS_NAME + "buyer_id"; // 买家id @@ -44,9 +42,6 @@ private static final long serialVersionUID = 1L; public final static String buyer_detail_address = CLASS_NAME + "buyer_detail_address"; // 买家详细地址 public final static String gmt_down_order = CLASS_NAME + "gmt_down_order"; // 下单时间 public final static String gmt_pay = CLASS_NAME + "gmt_pay"; // 支付时间 - public final static String reverse_status = CLASS_NAME + "reverse_status"; // all_refund:全部退款，part_refund,部分退款 - public final static String settle_status = CLASS_NAME + "settle_status"; // 0 未结清，1 已经结清 - public final static String profit_amount = CLASS_NAME + "profit_amount"; // 最终这笔单子的获利益 // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -64,12 +59,8 @@ private static final long serialVersionUID = 1L; private String buyerName; //买家微信 private String buyerWeixin; - //买家收货地址 - private String buyerAddress; //总价 private BigDecimal allPrice; - //wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered - private String status; //退款金额 private BigDecimal refundAmount; //退货数量 @@ -94,12 +85,6 @@ private static final long serialVersionUID = 1L; private Date gmtDownOrder; //支付时间 private Date gmtPay; - //all_refund:全部退款，part_refund,部分退款 - private String reverseStatus; - //0 未结清，1 已经结清 - private Integer settleStatus; - //最终这笔单子的获利益 - private BigDecimal profitAmount; /** * * @return @@ -220,21 +205,6 @@ private static final long serialVersionUID = 1L; this.buyerWeixin = buyerWeixin; } - /** - * 买家收货地址 - * @return - */ - public String getBuyerAddress() { - return buyerAddress; - } - /** - * 买家收货地址 - * @param buyerAddress - */ - public void setBuyerAddress(String buyerAddress) { - this.buyerAddress = buyerAddress; - } - /** * 总价 * @return @@ -250,21 +220,6 @@ private static final long serialVersionUID = 1L; this.allPrice = allPrice; } - /** - * wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered - * @return - */ - public String getStatus() { - return status; - } - /** - * wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - /** * 退款金额 * @return @@ -445,51 +400,6 @@ private static final long serialVersionUID = 1L; this.gmtPay = gmtPay; } - /** - * all_refund:全部退款，part_refund,部分退款 - * @return - */ - public String getReverseStatus() { - return reverseStatus; - } - /** - * all_refund:全部退款，part_refund,部分退款 - * @param reverseStatus - */ - public void setReverseStatus(String reverseStatus) { - this.reverseStatus = reverseStatus; - } - - /** - * 0 未结清，1 已经结清 - * @return - */ - public Integer getSettleStatus() { - return settleStatus; - } - /** - * 0 未结清，1 已经结清 - * @param settleStatus - */ - public void setSettleStatus(Integer settleStatus) { - this.settleStatus = settleStatus; - } - - /** - * 最终这笔单子的获利益 - * @return - */ - public BigDecimal getProfitAmount() { - return profitAmount; - } - /** - * 最终这笔单子的获利益 - * @param profitAmount - */ - public void setProfitAmount(BigDecimal profitAmount) { - this.profitAmount = profitAmount; - } - @Override public String toString() { return "VvTradeOrderEntity{" + @@ -501,9 +411,7 @@ private static final long serialVersionUID = 1L; ",buyerPhone=" + buyerPhone + ",buyerName=" + buyerName + ",buyerWeixin=" + buyerWeixin + - ",buyerAddress=" + buyerAddress + ",allPrice=" + allPrice + - ",status=" + status + ",refundAmount=" + refundAmount + ",refundCount=" + refundCount + ",buyerId=" + buyerId + @@ -516,9 +424,6 @@ private static final long serialVersionUID = 1L; ",buyerDetailAddress=" + buyerDetailAddress + ",gmtDownOrder=" + gmtDownOrder + ",gmtPay=" + gmtPay + - ",reverseStatus=" + reverseStatus + - ",settleStatus=" + settleStatus + - ",profitAmount=" + profitAmount + "}"; } } \ No newline at end of file diff --git a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java index 84cfea8..73b15e6 100644 --- a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java +++ b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java @@ -49,7 +49,7 @@ public class MysqlMain_update { List list = new ArrayList(); - String a = "vv_trade_order_line_settlement_prove"; + String a = "vv_trade_order"; for (String s : a.split(",")) { list.add(new TablesBean(s)); } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/OrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/OrderController.java index aa45078..b5b8daa 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/OrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/OrderController.java @@ -4,7 +4,6 @@ package com.heyu.api.controller.mm; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import com.heyu.api.alibaba.request.mm.enums.OrderStatusEnums; -import com.heyu.api.alibaba.request.mm.enums.ReverseStatusEnums; import com.heyu.api.alibaba.request.mm.order.*; import com.heyu.api.alibaba.request.mm.order.resp.PackageDTO; import com.heyu.api.alibaba.request.mm.order.resp.VVOrderListResp; @@ -23,8 +22,10 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Slf4j @RestController @@ -196,12 +197,6 @@ public class OrderController { tradeOrderLineEntity.setStatus(OrderStatusEnums.shipping.getStatus()); // 已经发货 vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity); } - List vvTradeOrderLineEntities = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIdStatus(vvTradeOrderEntity.getId() - , OrderStatusEnums.wait_shipping.getStatus()); - if (CollectionUtils.isEmpty(vvTradeOrderLineEntities)) { - vvTradeOrderEntity.setStatus(OrderStatusEnums.shipping.getStatus()); - vvTradeOrderDao.updateVvTradeOrderById(vvTradeOrderEntity); - } return R.ok(); } @@ -216,17 +211,10 @@ public class OrderController { List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(vvOrderRequest.getTradeOrderLineIds()); for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { - tradeOrderLineEntity.setStatus(OrderStatusEnums.wait_shipping.getStatus()); tradeOrderLineEntity.setTrackNumber(null); vvTradeOrderLineDao.updateCoverVvTradeOrderLineById(tradeOrderLineEntity); } - Long tradeOrderId = vvTradeOrderLineEntityList.get(0).getTradeOrderId(); - - VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(tradeOrderId); - - vvTradeOrderEntity.setStatus(OrderStatusEnums.wait_shipping.getStatus()); - vvTradeOrderDao.updateVvTradeOrderById(vvTradeOrderEntity); return R.ok(); } @@ -245,13 +233,7 @@ public class OrderController { tradeOrderLineEntity.setStatus(OrderStatusEnums.delivered.getStatus()); vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity); } - Long tradeOrderId = vvTradeOrderLineEntityList.get(0).getTradeOrderId(); - List countList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIdNEStatus(tradeOrderId, OrderStatusEnums.delivered.getStatus()); - if (CollectionUtils.isEmpty(countList)) { - VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(tradeOrderId); - vvTradeOrderEntity.setStatus(OrderStatusEnums.delivered.getStatus()); - vvTradeOrderDao.updateVvTradeOrderById(vvTradeOrderEntity); - } + return R.ok(); } @@ -264,15 +246,12 @@ public class OrderController { public R settlement(@RequestBody VvSettleProveDTO vvSettleProveDTO) { List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(vvSettleProveDTO.getTradeOrderLineIds()); - List tradeOrderIds = new ArrayList<>(); - VvSettlementProveEntity vvSettlementProveEntity = new VvSettlementProveEntity(); vvSettlementProveDao.insertOrUpdateVvSettlementProve(vvSettlementProveEntity); for (ResourceDTO resource : vvSettleProveDTO.getResources()) { - VvSettlementProveDetailEntity vvSettlementProveDetailEntity = new VvSettlementProveDetailEntity(); vvSettlementProveDetailEntity.setType(resource.getType()); vvSettlementProveDetailEntity.setResourceUrl(resource.getResourceUrl()); @@ -281,14 +260,11 @@ public class OrderController { } for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { - tradeOrderIds.add(tradeOrderLineEntity.getTradeOrderId()); tradeOrderLineEntity.setSettleStatus(1); // 更新利润 tradeOrderLineEntity.setProfitAmount(BigDecimalUtil.subtract(tradeOrderLineEntity.getSalePrice(), tradeOrderLineEntity.getOriginPrice())); vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity); - - // 将子单和证据关联 VvTradeOrderLineSettlementProveEntity vvTradeOrderLineSettlementProveEntity = new VvTradeOrderLineSettlementProveEntity(); vvTradeOrderLineSettlementProveEntity.setTradeOrderLineId(tradeOrderLineEntity.getId()); @@ -296,27 +272,6 @@ public class OrderController { vvTradeOrderLineSettlementProveDao.insertOrUpdateVvTradeOrderLineSettlementProve(vvTradeOrderLineSettlementProveEntity); } - // 设置这笔订单已经结算 - for (Long tradeOrderId : tradeOrderIds) { - VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(tradeOrderId); - List vvTradeOrderLineList0 = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIdStatusAndReverseStatus( - tradeOrderId, OrderStatusEnums.delivered.getStatus(), - Arrays.asList(ReverseStatusEnums.refunded.getStatus(), ReverseStatusEnums.close.getStatus()) - ); - - List vvTradeOrderLineList1 = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(tradeOrderId); - if (CollectionUtils.isNotEmpty(vvTradeOrderLineList0) - && CollectionUtils.isNotEmpty(vvTradeOrderLineList1) - && vvTradeOrderLineList0.size() == vvTradeOrderLineList1.size()) { - vvTradeOrderEntity.setSettleStatus(1); - BigDecimal profitAmount = BigDecimal.ZERO; - for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineList1) { - profitAmount= BigDecimalUtil.add(profitAmount, tradeOrderLineEntity.getProfitAmount()); - } - vvTradeOrderEntity.setProfitAmount(profitAmount); - vvTradeOrderDao.updateVvTradeOrderById(vvTradeOrderEntity); - } - } return R.ok(); } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java index 1ed50e8..f22bbb7 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java @@ -87,14 +87,13 @@ public class AppOrderController { return vvTradeOrderDao.selectAppByCondition(page, vvOrderRequest.getOrderIds(), vvOrderRequest.getBuyerId(), - vvOrderRequest.getStatus(), vvOrderRequest.getMinCreateTimestamp(), vvOrderRequest.getMaxCreateTimestamp(), - OrderStatusEnums.delete.getStatus(), vvOrderRequest.getCreateTimestampSort() ); } }); + List vvTradeOrderEntities = pageUtils.getRows(); List tradeOrderIds = new ArrayList<>(); @@ -288,7 +287,6 @@ public class AppOrderController { vvTradeOrderEntity.setDistrict(vvBuyerAddress.getDistrict()); vvTradeOrderEntity.setBuyerDetailAddress(vvBuyerAddress.getDetail()); vvTradeOrderEntity.setAllPrice(allPrice); - vvTradeOrderEntity.setStatus(OrderStatusEnums.wait_pay.getStatus()); vvTradeOrderEntity.setBuyerId(vvOrderRequest.getBuyerId()); vvTradeOrderEntity.setCreateTimestamp(System.currentTimeMillis()); vvTradeOrderEntity.setModifyTimestamp(System.currentTimeMillis()); @@ -330,13 +328,6 @@ public class AppOrderController { tradeOrderLineEntity.setStatus(OrderStatusEnums.delivered.getStatus()); vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity); } - Long tradeOrderId = vvTradeOrderLineEntityList.get(0).getTradeOrderId(); - List countList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIdNEStatus(tradeOrderId, OrderStatusEnums.delivered.getStatus()); - if (CollectionUtils.isEmpty(countList)) { - VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(tradeOrderId); - vvTradeOrderEntity.setStatus(OrderStatusEnums.delivered.getStatus()); - vvTradeOrderDao.updateVvTradeOrderById(vvTradeOrderEntity); - } return R.ok(); }