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-09 11:28:22 +08:00
parent 8bdfe828c2
commit 76ca0982bc
6 changed files with 59 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineEntity.java
View File

@ -1,16 +1,16 @@
package com.heyu.api.data.entity.vv;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.lz.mybatis.plugin.annotations.AS;
import java.math.BigDecimal;
import java.util.Date;import java.util.Date;
import java.util.Date;
/**
*购物车
* @author quyixiao
* @since 2025-11-08
* @since 2025-11-09
*/
@Data
@ -27,7 +27,7 @@ private static final long serialVersionUID = 1L;
public final static String modify_time = CLASS_NAME + "modify_time"; // 修改时间
public final static String sale_price = CLASS_NAME + "sale_price"; // 单价
public final static String num_ = CLASS_NAME + "num"; // 数量
public final static String status_ = CLASS_NAME + "status"; // wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered， cancel 订单取消
public final static String status_ = CLASS_NAME + "status"; // wait_pay:待支付。 待发货：wait_shipping。已发货: shipping。 已经签收:shipped。已妥投：delivered。订单取消:cancel
public final static String trade_order_id = CLASS_NAME + "trade_order_id"; // 订单号
public final static String refund_amount = CLASS_NAME + "refund_amount"; // 退款金额
public final static String track_number = CLASS_NAME + "track_number"; // 包裹追踪号
@ -90,7 +90,7 @@ private static final long serialVersionUID = 1L;
private BigDecimal salePrice;
//数量
private Integer num;
//wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered， cancel 订单取消
//wait_pay:待支付。 待发货：wait_shipping。已发货: shipping。 已经签收:shipped。已妥投：delivered。订单取消:cancel
private String status;
//订单号
private Long tradeOrderId;
@ -281,14 +281,14 @@ private static final long serialVersionUID = 1L;
}
/**
* wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered， cancel 订单取消
* wait_pay:待支付。 待发货：wait_shipping。已发货: shipping。 已经签收:shipped。已妥投：delivered。订单取消:cancel
* @return
*/
public String getStatus() {
return status;
}
/**
* wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered， cancel 订单取消
* wait_pay:待支付。 待发货：wait_shipping。已发货: shipping。 已经签收:shipped。已妥投：delivered。订单取消:cancel
* @param status
*/
public void setStatus(String status) {

2
api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java
View File

@ -48,7 +48,7 @@ public class MysqlMain_update {
}
List<TablesBean> list = new ArrayList<TablesBean>();
list.add(new TablesBean("vv_app_category"));
list.add(new TablesBean("vv_trade_order_line"));

3
api-third/src/main/java/com/heyu/api/alibaba/request/mm/enums/OrderStatusEnums.java
View File

@ -7,7 +7,8 @@ public enum OrderStatusEnums {
cancel("cancel","买家取消订单"),
close("close","卖家关闭订单"),
shipping("shipping","已发货"),
delivered("delivered","已签收"),
shipped("shipped","已签收"),
delivered("delivered","已妥投"),
all_refund("all_refund","全部退款"),
part_refund("part_refund","部分退款"),
delete("delete","删除"),

20
api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvShippedDTO.java Normal file
View File

@ -0,0 +1,20 @@
package com.heyu.api.alibaba.request.mm.order;
import lombok.Data;
import java.util.List;
@Data
public class VvShippedDTO {
/***
* 子订单号
*/
private List<Long> tradeOrderLineIds;
}

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

@ -98,7 +98,6 @@ public class AdminOrderController {
vvTradeOrderEntities.add(vvTradeOrderEntityMap.get(vvTradeOrderLineEntity.getTradeOrderId()));
}
vvOrderRequest.setTradeOrderIds(tradeOrderIds);
// 重新获取子单
@ -237,7 +236,28 @@ public class AdminOrderController {
}
/***
* 订单打包
* 已签收
*/
@RequestMapping("/shipped")
public R shipped(@RequestBody VvShippedDTO vvDeliveredDTO) {
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(vvDeliveredDTO.getTradeOrderLineIds());
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
if (!OrderStatusEnums.shipping.getStatus().equals(tradeOrderLineEntity.getStatus())) {
return R.error("订单状态不对");
}
}
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
tradeOrderLineEntity.setStatus(OrderStatusEnums.shipped.getStatus());
tradeOrderLineEntity.setGmtDelivered(new Date());
vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
}
return R.ok();
}
/***
* 订单妥投
*/
@RequestMapping("/delivered")
public R delivered(@RequestBody VvDeliveredDTO vvDeliveredDTO) {
@ -252,11 +272,9 @@ public class AdminOrderController {
tradeOrderLineEntity.setGmtDelivered(new Date());
vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
}
return R.ok();
}
/***
* 上传结算证据
*/

11
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java
View File

@ -419,7 +419,6 @@ public class AppOrderController {
}
}
return R.ok();
}
@ -428,10 +427,14 @@ public class AppOrderController {
*/
@Describe("订单确认收货")
@RequestMapping("/delivered")
public R topack(@RequestBody AppDeliveredDTO vvDeliveredDTO) {
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(vvDeliveredDTO.getTrackNumber());
public R delivered(@RequestBody AppDeliveredDTO vvDeliveredDTO) {
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumberBuyerId(
vvDeliveredDTO.getTrackNumber(),
vvDeliveredDTO.getBuyerId()
);
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
if (!OrderStatusEnums.shipping.getStatus().equals(tradeOrderLineEntity.getStatus())) {
if (!OrderStatusEnums.shipped.getStatus().equals(tradeOrderLineEntity.getStatus())) {
return R.error("订单状态不对");
}
}