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 10:33:22 +08:00
parent 7a7f20aa54
commit cddbeaf9b9
6 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java
View File

@ -62,8 +62,6 @@ public interface VvTradeOrderDao extends BaseMapper<VvTradeOrderEntity> {
@IF@LE Long maxCreateTimestamp,
@IF String createTimestampSort);
Integer updateByBuerIdAndIds(String status,@By Long buyerId,@By Long id);
List<VvTradeOrderEntity> selectVvTradeOrderByTradeOrderIds(@IFNullReturnEmpty @IN List<Long> id);

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

@ -151,4 +151,11 @@ public interface VvTradeOrderLineDao extends BaseMapper<VvTradeOrderLineEntity>
List<VvTradeOrderLineEntity> selectVvTradeOrderLineByBuyerIdTrackNumber(Long buyerId, String trackNumber);
List<VvTradeOrderLineEntity> selectByTradeOrderIdAndTransactionId(Long tradeOrderId, @IF String transactionId);
Integer updateByBuerIdAndIds(String status,@By Long buyerId,@By Long id);
List<VvTradeOrderLineEntity> selectVvTradeOrderLineByTrackNumberBuyerId(String trackNumber,Long buyerId);
List<VvTradeOrderLineEntity> selectVvTradeOrderLineByTradeOrderIdBuyerId(Long tradeOrderId,Long buyerId);
}

18
api-mapper/src/main/java/com/heyu/api/data/utils/CollectionUtils.java
View File

@ -1,11 +1,10 @@
package com.heyu.api.data.utils;
import java.util.Collection;
import java.util.Map;
public class CollectionUtils {
public static boolean notContainsKey(Map map, Object key) {
if(map == null){
return true;
@ -14,4 +13,19 @@ public class CollectionUtils {
return !map.containsKey(key);
}
/***
* 如果不是空
* @param collection
* @return
*/
public static boolean isNotEmpty(Collection collection) {
if(collection == null){
return false;
}
if(org.springframework.util.CollectionUtils.isEmpty(collection)){
return false;
}
return true;
}
}

4
api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDeleteDTO.java
View File

@ -14,6 +14,10 @@ public class VvTradeOrderDeleteDTO extends AppBaseRequest {
private String trackNumber;
/***
* 如果订单还没有发货，就传订单编号 ，如果订单已经发货了，就传 物流单号
*/
private Long tradeOrderId;
}

2
api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java
View File

@ -33,8 +33,6 @@ public class AppOrderRequest extends AppBaseRequest {
// wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered
private String status;
/***
* 逆向状态
*/

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

@ -394,14 +394,32 @@ public class AppOrderController {
return R.ok().setData(vo);
}
// /app/order/delete
@Describe("删除订单")
@RequestMapping("/delete")
public R add(@RequestBody VvTradeOrderDeleteDTO vvOrderRequest) {
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(vvOrderRequest.getTrackNumber());
for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
vvTradeOrderDao.updateByBuerIdAndIds(OrderStatusEnums.delete.getStatus(), vvOrderRequest.getBuyerId(), vvTradeOrderLineEntity.getId());
if (StringUtils.isNotEmpty(vvOrderRequest.getTrackNumber())) {
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumberBuyerId(
vvOrderRequest.getTrackNumber(),vvOrderRequest.getBuyerId());
if (CollectionUtils.isNotEmpty(vvTradeOrderLineEntityList)) {
for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
vvTradeOrderLineDao.updateByBuerIdAndIds(OrderStatusEnums.delete.getStatus(), vvOrderRequest.getBuyerId(), vvTradeOrderLineEntity.getId());
}
}
}
if (vvOrderRequest.getTradeOrderId() != null) {
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIdBuyerId(
vvOrderRequest.getTradeOrderId(),vvOrderRequest.getBuyerId());
if (CollectionUtils.isNotEmpty(vvTradeOrderLineEntityList)) {
for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
vvTradeOrderLineDao.updateByBuerIdAndIds(OrderStatusEnums.delete.getStatus(), vvOrderRequest.getBuyerId(), vvTradeOrderLineEntity.getId());
}
}
}
return R.ok();
}