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-12-04 21:04:34 +08:00
parent 715d429a1b
commit c665dd6f7a
6 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,10 +11,7 @@ package com.heyu.api.data.dao.vv;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.heyu.api.data.entity.vv.VvBuyerAddressEntity; import com.heyu.api.data.entity.vv.VvBuyerAddressEntity;
import com.lz.mybatis.plugin.annotations.By; import com.lz.mybatis.plugin.annotations.*;
import com.lz.mybatis.plugin.annotations.Column;
import com.lz.mybatis.plugin.annotations.IF;
import com.lz.mybatis.plugin.annotations.OrderByIdDesc;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -43,7 +40,7 @@ public interface VvBuyerAddressDao extends BaseMapper<VvBuyerAddressEntity> {
@OrderByIdDesc @OrderByIdDesc
List<VvBuyerAddressEntity> selectAppByCondition(IPage page, Long buyerId); List<VvBuyerAddressEntity> selectAppByCondition(IPage page, Long buyerId,@NE String status);

2
api-mapper/src/main/java/com/heyu/api/data/enums/BuyerAddressEnums.java
View File

@ -4,7 +4,7 @@ public enum BuyerAddressEnums {
common("common","默认"), common("common","默认"),
default_address("default","默认地址"), default_address("default","默认地址"),
delete("delete","删除") deleted("deleted","删除")
; ;

3
api-mapper/src/main/java/com/heyu/api/data/service/impl/AbstractOrderAction.java
View File

@ -28,7 +28,8 @@ public abstract class AbstractOrderAction {
new ToShippingAction(), new ToShippingAction(),
new TrackLogisticsAction(), new TrackLogisticsAction(),
new UnShippingAction(), new UnShippingAction(),
new AppToPayAction() new AppToPayAction(),
new BuyerSubmitCommentAction()
); );
public static List<ActionDTO> getOrderActionDTO(VvTradeOrderLineEntity vvTradeOrderLineEntity, boolean isApp) { public static List<ActionDTO> getOrderActionDTO(VvTradeOrderLineEntity vvTradeOrderLineEntity, boolean isApp) {

3
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppBuyerAddressManagerController.java
View File

@ -47,7 +47,8 @@ public class AppBuyerAddressManagerController {
@Override @Override
public List doSelect(IPage page) { public List doSelect(IPage page) {
return vvBuyerAddressDao.selectAppByCondition(page, return vvBuyerAddressDao.selectAppByCondition(page,
appBuyerAddressRequest.getBuyerId() appBuyerAddressRequest.getBuyerId(),
BuyerAddressEnums.deleted.getStatus()
); );
} }
}); });

1
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCommentController.java
View File

@ -84,7 +84,6 @@ public class AppCommentController {
} }
}); });
} else { } else {
pageUtils = PPageUtils.startPage(appCommentRequest.getPageNum(), appCommentRequest.getPageSize()) pageUtils = PPageUtils.startPage(appCommentRequest.getPageNum(), appCommentRequest.getPageSize())
.doSelect(new ISelect() { .doSelect(new ISelect() {
@Override @Override

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

@ -144,6 +144,13 @@ public class AppOrderController {
@Describe("订单列表") @Describe("订单列表")
@RequestMapping("/list") @RequestMapping("/list")
public R list(@RequestBody AppOrderRequest vvOrderRequest) { public R list(@RequestBody AppOrderRequest vvOrderRequest) {
Integer commentStatus = null;
if(ApiConstants.WAIT_COMMENT.equals(vvOrderRequest.getStatus())){
commentStatus = 0;
vvOrderRequest.setStatus(OrderStatusEnums.delivered.getStatus());
}
Integer newcommentStatus = commentStatus;
PPageUtils pageUtils = PPageUtils.startPage(vvOrderRequest.getPageNum(), vvOrderRequest.getPageSize()) PPageUtils pageUtils = PPageUtils.startPage(vvOrderRequest.getPageNum(), vvOrderRequest.getPageSize())
.doSelect(new ISelect() { .doSelect(new ISelect() {
@Override @Override
@ -152,7 +159,7 @@ public class AppOrderController {
page, page,
vvOrderRequest.getTradeOrderIds(), vvOrderRequest.getTradeOrderIds(),
vvOrderRequest.getStatus(), vvOrderRequest.getStatus(),
ApiConstants.WAIT_COMMENT.equals(vvOrderRequest.getStatus()) ? 1 :null, newcommentStatus,
OrderStatusEnums.delete.getStatus(), OrderStatusEnums.delete.getStatus(),
vvOrderRequest.getMinCreateTimestamp(), vvOrderRequest.getMinCreateTimestamp(),
vvOrderRequest.getMaxCreateTimestamp(), vvOrderRequest.getMaxCreateTimestamp(),