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-03 23:43:43 +08:00
parent 5afdeae8b0
commit 3cf1d27620
8 changed files with 66 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api-mapper/src/main/java/com/heyu/api/data/constants/ApiConstants.java
View File

@ -96,6 +96,7 @@ public class ApiConstants {
public static String SET_BUYER_NAME = "setBuyerName";
public static final String token_activity = "token_activity";
public static String WAIT_COMMENT = "wait_comment";
/**
* 定时任务状态

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

@ -129,15 +129,16 @@ public interface VvTradeOrderLineDao extends BaseMapper<VvTradeOrderLineEntity>
VvTradeOrderLineEntity.origin_price
})
List<VvTradeOrderLineEntity> selectByAppCondition(IPage page,
@IF @IN List<Long> tradeOrderId,
@IF String status,
@IF@NE @Column(VvTradeOrderLineEntity.status_) String deleteStatus,
@IF @GE @Column(VvTradeOrderLineEntity.create_timestamp) Long minCreateTimestamp,
@IF @LE @Column(VvTradeOrderLineEntity.create_timestamp) Long maxCreateTimestamp,
@IF @LIKE String productName,
@IFNullReturnEmpty Long buyerId,
@IF @IsNotEmpty String reverseStatus,
@IF @OrderBy(VvTradeOrderLineEntity.create_timestamp) String createTimestampSort);
@IF @IN List<Long> tradeOrderId,
@IF String status,
@IF Integer commentStatus,
@IF @NE @Column(VvTradeOrderLineEntity.status_) String deleteStatus,
@IF @GE @Column(VvTradeOrderLineEntity.create_timestamp) Long minCreateTimestamp,
@IF @LE @Column(VvTradeOrderLineEntity.create_timestamp) Long maxCreateTimestamp,
@IF @LIKE String productName,
@IFNullReturnEmpty Long buyerId,
@IF @IsNotEmpty String reverseStatus,
@IF @OrderBy(VvTradeOrderLineEntity.create_timestamp) String createTimestampSort);
@OrderBy(VvTradeOrderLineEntity.id_)

25
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-22
* @since 2025-12-03
*/
@Data
@ -94,6 +94,7 @@ private static final long serialVersionUID = 1L;
public final static String reject_sign_receipt_reason = CLASS_NAME + "reject_sign_receipt_reason"; // 拒绝签收原因
public final static String reject_sign_receipt_features = CLASS_NAME + "reject_sign_receipt_features"; // 拒绝签收的信息
public final static String activity_info = CLASS_NAME + "activity_info"; // 活动信息
public final static String comment_status = CLASS_NAME + "comment_status"; // 评论状态
//
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ -241,6 +242,8 @@ private static final long serialVersionUID = 1L;
private String rejectSignReceiptFeatures;
//活动信息
private String activityInfo;
//评论状态
private Integer commentStatus;
/**
*
* @return
@ -1336,6 +1339,21 @@ private static final long serialVersionUID = 1L;
this.activityInfo = activityInfo;
}
/**
* 评论状态
* @return
*/
public Integer getCommentStatus() {
return commentStatus;
}
/**
* 评论状态
* @param commentStatus
*/
public void setCommentStatus(Integer commentStatus) {
this.commentStatus = commentStatus;
}
@Override
public String toString() {
return "VvTradeOrderLineEntity{" +
@ -1412,6 +1430,7 @@ private static final long serialVersionUID = 1L;
",rejectSignReceiptReason=" + rejectSignReceiptReason +
",rejectSignReceiptFeatures=" + rejectSignReceiptFeatures +
",activityInfo=" + activityInfo +
",commentStatus=" + commentStatus +
"}";
}
}

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

@ -28,4 +28,16 @@ public class CollectionUtils {
return true;
}
/***
* 如果不是空
* @param collection
* @return
*/
public static boolean isEmpty(Collection collection) {
return !isNotEmpty(collection);
}
}

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_shopping_cart"));
list.add(new TablesBean("vv_trade_order_line"));
Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();
for (int i = 0; i < list.size(); i++) {

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

@ -29,7 +29,16 @@ public class AppOrderRequest extends AppBaseRequest {
private String createTimestampSort;
// wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered
// create:订单创建,
// wait_pay:待支付,支付完成,
// 待发货:wait_shipping
// 买家申请取消订单:apply_cancel
// 买家关闭订单:close
// 已发货，运送中:shipping,
// 已投递，比如入到快递柜:shipped
// 已妥投:delivered,
// 退款:refund
// 待评论 ： wait_comment
private String status;
/***

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

@ -67,7 +67,6 @@ public class AppCommentController {
@RequestMapping("/list")
@Describe("评论列表")
public R list(@RequestBody AppCommentRequest appCommentRequest) {
PPageUtils pageUtils = null;
// /***
// * 状态 待审批 wait_approval 待审批, approval_pass，审批通过 , approval_not_pass 审批未通过，如果审批未通过，即自己可见，但别人不可见
@ -155,6 +154,8 @@ public class AppCommentController {
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumberGroupBySkuId(appCommentRequest.getTrackNumber());
for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
doAddComment(appCommentRequest, vvTradeOrderLineEntity);
vvTradeOrderLineEntity.setCommentStatus(1);
vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity);
}
return R.ok();
}

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

@ -145,9 +145,11 @@ public class AppOrderController {
.doSelect(new ISelect() {
@Override
public List doSelect(IPage page) {
return vvTradeOrderLineDao.selectByAppCondition(page,
return vvTradeOrderLineDao.selectByAppCondition(
page,
vvOrderRequest.getTradeOrderIds(),
vvOrderRequest.getStatus(),
ApiConstants.WAIT_COMMENT.equals(vvOrderRequest.getStatus()) ? 1 :null,
OrderStatusEnums.delete.getStatus(),
vvOrderRequest.getMinCreateTimestamp(),
vvOrderRequest.getMaxCreateTimestamp(),
@ -161,6 +163,11 @@ public class AppOrderController {
// 获取子单
List<VvTradeOrderLineEntity> vvTradeOrderLineEntitiesGroupByTradeOrderId = pageUtils.getRows();
if(CollectionUtils.isEmpty(vvTradeOrderLineEntitiesGroupByTradeOrderId)){
return R.ok().setData(new ArrayList<>());
}
// 获取订单
List<Long> tradeOrderIds = SanUtils.list2listFilterNull(vvTradeOrderLineEntitiesGroupByTradeOrderId, VvTradeOrderLineEntity::getTradeOrderId);
// 拿到订单的顺序