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

Merge branch 'master' of https://git.iwulin.tech/quyixiao/eb-service-api

Browse Source
This commit is contained in:
quyixiao 2025-11-21 09:07:21 +08:00
commit 6533bfc4fd
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java
View File

@ -148,8 +148,6 @@ public class AdminReverseController {
vvReverseOrderEntity.setGmtSellerAgreeReturn(new Date()); vvReverseOrderEntity.setGmtSellerAgreeReturn(new Date());
vvReverseOrderEntity.setSellerAgreeReturnUser(vvApproveRequest.getUserName()); vvReverseOrderEntity.setSellerAgreeReturnUser(vvApproveRequest.getUserName());
VvPackageEntity vvPackageEntity = new VvPackageEntity(); VvPackageEntity vvPackageEntity = new VvPackageEntity();
vvPackageEntity.setShippingAmount(BigDecimal.ZERO); vvPackageEntity.setShippingAmount(BigDecimal.ZERO);
vvPackageEntity.setShippingType(ShippingTypeEnums.reverse.getType()); vvPackageEntity.setShippingType(ShippingTypeEnums.reverse.getType());
@ -157,7 +155,6 @@ public class AdminReverseController {
vvPackageEntity.setSellerWarehouseId(vvApproveRequest.getSellerWarehouseId()); vvPackageEntity.setSellerWarehouseId(vvApproveRequest.getSellerWarehouseId());
vvPackageEntity.setSignReceiptStatus(ApiConstants.NOT_SIGN_RECEIPT); vvPackageEntity.setSignReceiptStatus(ApiConstants.NOT_SIGN_RECEIPT);
vvPackageDao.insertOrUpdateVvPackage(vvPackageEntity); vvPackageDao.insertOrUpdateVvPackage(vvPackageEntity);
} else if (ReverseStatusEnums.reject_return.getStatus().equals(targetStatus)) { } else if (ReverseStatusEnums.reject_return.getStatus().equals(targetStatus)) {
vvReverseOrderEntity.setGmtRejectReturn(new Date()); vvReverseOrderEntity.setGmtRejectReturn(new Date());
vvReverseOrderEntity.setRejectReturnUser(vvApproveRequest.getUserName()); vvReverseOrderEntity.setRejectReturnUser(vvApproveRequest.getUserName());