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-08-29 09:06:50 +08:00
parent bba5c8904c
commit afb46513ae
8 changed files with 574 additions and 532 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-mapper/pom.xml
View File

@ -45,7 +45,7 @@
<dependency>
<groupId>com.lz.mybatis.plugin</groupId>
<artifactId>lz_mybatis_plugin</artifactId>
<version>19.0-SNAPSHOT</version>
<version>20.0-SNAPSHOT</version>
</dependency>

8
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPackageDao.java
View File

@ -7,8 +7,10 @@ package com.heyu.api.data.dao.vv;
* @author quyixiao
* @since 2025-08-23
*/
import com.heyu.api.data.entity.vv.VvPackageEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.heyu.api.data.entity.vv.VvPackageEntity;
import com.lz.mybatis.plugin.annotations.IFNull;
import com.lz.mybatis.plugin.annotations.IN;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -37,7 +39,5 @@ public interface VvPackageDao extends BaseMapper<VvPackageEntity> {
int deleteVvPackageById(@Param("id")Long id);
List<VvPackageEntity> selectVvPackageByTrackNumbers(@IN List<String> trackNumber);
List<VvPackageEntity> selectVvPackageByTrackNumbers(@IFNull @IN List<String> trackNumber);
}

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

File diff suppressed because it is too large Load Diff

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

@ -49,7 +49,7 @@ public class MysqlMain_update {
List<TablesBean> list = new ArrayList<TablesBean>();
String a = "vv_resource";
String a = "vv_trade_order_line";
for (String s : a.split(",")) {
list.add(new TablesBean(s));
}

7
api-mapper/src/test/java/com/test/xxx/mysql/SqlParseUtilsTest.java
View File

@ -1,6 +1,6 @@
package com.test.xxx.mysql;
import com.heyu.api.data.dao.vv.VvTradeOrderLineDao;
import com.heyu.api.data.dao.vv.VvPackageDao;
import com.lz.mybatis.plugin.utils.TestParseUtils;
import com.lz.mybatis.plugin.utils.t.Tuple2;
import org.junit.Test;
@ -11,10 +11,7 @@ SqlParseUtilsTest {
@Test
public void test1() {
Tuple2<Boolean, String> tuple = TestParseUtils.testSql(VvTradeOrderLineDao::selectByAdminCondition).getData();
Tuple2<Boolean, String> tuple = TestParseUtils.testSql(VvPackageDao::selectVvPackageByTrackNumbers).getData();
System.out.println(tuple.getSecond());

23
api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderLineResp.java Normal file
View File

@ -0,0 +1,23 @@
package com.heyu.api.alibaba.request.mm.order.resp;
import com.heyu.api.data.entity.vv.VvPackageEntity;
import com.heyu.api.data.entity.vv.VvTradeOrderEntity;
import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
import lombok.Data;
@Data
public class AppTradeOrderLineResp extends VvTradeOrderLineEntity {
/***
* 订单相关的信息
*/
private VvTradeOrderEntity tradeOrderEntity;
/***
*
* 包相关的信息
*
*/
private VvPackageEntity vvPackageEntity;
}

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

@ -64,6 +64,7 @@ public class AppIndexPageController {
return vvProductDao.selectIndexVvProduct(page,
vvProductRequest.getProductName(),
vvProductRequest.getFrontPage(),
vvProductRequest.getStatus(),
vvProductRequest.getCategoryId1(),
vvProductRequest.getCategoryId2(),

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

@ -96,63 +96,45 @@ public class AppOrderController {
// 获取子单
List<VvTradeOrderLineEntity> vvTradeOrderLineEntities = pageUtils.getRows();
// 获取订单
List<Long> tradeOrderIds = SanUtils.list2listFilterNull(vvTradeOrderLineEntities, VvTradeOrderLineEntity::getTradeOrderId);
List<VvTradeOrderEntity> tradeOrderEntities = vvTradeOrderDao.selectVvTradeOrderByTradeOrderIds(tradeOrderIds);
// 对订单进行排序，必须按照子单的顺序
Map<Long, VvTradeOrderEntity> vvTradeOrderEntityMap = SanUtils.list2Map(tradeOrderEntities, VvTradeOrderEntity::getId);
List<VvTradeOrderEntity> vvTradeOrderEntities = new ArrayList<>();
for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntities) {
vvTradeOrderEntities.add(vvTradeOrderEntityMap.get(vvTradeOrderLineEntity.getTradeOrderId()));
}
// 重新获取子单
List<VvTradeOrderLineEntity> list = vvTradeOrderLineDao.selectByAdminConditionList(
vvOrderRequest.getTradeOrderIds(),
null,
null,
null,
null,
null,
vvOrderRequest.getStatus(),
null,
vvOrderRequest.getMinCreateTimestamp(),
vvOrderRequest.getMaxCreateTimestamp(),
vvOrderRequest.getProductName(),
null,
null,
vvOrderRequest.getBuyerId(),
vvOrderRequest.getReverseStatus(),
vvOrderRequest.getCreateTimestampSort());
SanUtils.setNull(list,
SanUtils.setNull(vvTradeOrderLineEntities,
VvTradeOrderLineEntity::getProfitAmount,
VvTradeOrderLineEntity::getModifyTime,
VvTradeOrderLineEntity::getIsDelete,
VvTradeOrderLineEntity::getCreateTime
);
List<String> trackNumbers = SanUtils.list2listFilterNull(list, VvTradeOrderLineEntity::getTrackNumber);
List<String> trackNumbers = SanUtils.list2listFilterNull(vvTradeOrderLineEntities, VvTradeOrderLineEntity::getTrackNumber);
Map<String, VvPackageEntity> vvPackageEntityMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(trackNumbers)) {
List<VvPackageEntity> packageEntities = vvPackageDao.selectVvPackageByTrackNumbers(trackNumbers);
for (VvPackageEntity packageEntity : packageEntities) {
vvPackageEntityMap.put(packageEntity.getTrackNumber(), packageEntity);
}
vvPackageEntityMap = SanUtils.list2Map(packageEntities, VvPackageEntity::getTrackNumber);
}
List<VVOrderListResp> vvOrderListResps = new ArrayList<>();
for (VvTradeOrderEntity vvTradeOrderEntity : vvTradeOrderEntities) {
VVOrderListResp vvOrderListResp = new VVOrderListResp();
BeanUtils.copyProperties(vvTradeOrderEntity, vvOrderListResp);
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = new ArrayList<>();
for (VvTradeOrderLineEntity tradeOrderLineEntity : list) {
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntities) {
if (vvTradeOrderEntity.getId().equals(tradeOrderLineEntity.getTradeOrderId())) {
vvTradeOrderLineEntityList.add(tradeOrderLineEntity);
}
@ -291,6 +273,7 @@ public class AppOrderController {
vvTradeOrderLineEntity.setProductMainImageUrl(vvProduct.getMainImageUrl());
vvTradeOrderLineEntity.setSkuInfo(JSON.toJSONString(propertyNameValues));
vvTradeOrderLineEntityList.add(vvTradeOrderLineEntity);
vvTradeOrderLineEntity.setBatchNum(vvTradeOrderLineDTO.getNum());
}
}