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-21 22:54:04 +08:00
parent 027b962ccc
commit ec9efdc272
3 changed files with 10 additions and 9 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/enums/AwardStatusEnums.java
View File

@ -5,8 +5,6 @@ package com.heyu.api.data.enums;
* create 创建, canceled 取消 , arrive，到账 * create 创建, canceled 取消 , arrive，到账
*/ */
public enum AwardStatusEnums { public enum AwardStatusEnums {
create("create", "创建"), create("create", "创建"),
canceled("canceled", "取消"), canceled("canceled", "取消"),

8
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerWarehouseController.java
View File

@ -28,9 +28,17 @@ public class AdminSellerWarehouseController {
@Describe("仓库添加") @Describe("仓库添加")
@RequestMapping("/insertOrUpdate") @RequestMapping("/insertOrUpdate")
public R add(@RequestBody VvSellerWarehouseEntity warehouseEntity) { public R add(@RequestBody VvSellerWarehouseEntity warehouseEntity) {
if(warehouseEntity.getContry() == null){
warehouseEntity.setContry("中国");
}
vvSellerWarehouseDao.insertOrUpdateVvSellerWarehouse(warehouseEntity); vvSellerWarehouseDao.insertOrUpdateVvSellerWarehouse(warehouseEntity);
return R.ok().setData(warehouseEntity); return R.ok().setData(warehouseEntity);
} }
} }

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

@ -236,9 +236,6 @@ public class AppOrderController {
for (VvTradeOrderLineDTO vvTradeOrderLineDTO : vvOrderRequest.getVvTradeOrderLineDTOList()) { for (VvTradeOrderLineDTO vvTradeOrderLineDTO : vvOrderRequest.getVvTradeOrderLineDTOList()) {
VvSkuEntity vvSkuEntity = skuEntityMap.get(vvTradeOrderLineDTO.getSkuId()); VvSkuEntity vvSkuEntity = skuEntityMap.get(vvTradeOrderLineDTO.getSkuId());
List<VvSkuPropertyValueEntity> vvSkuPropertyValueEntities = vvSkuPropertyValueMap.get(vvTradeOrderLineDTO.getSkuId()); List<VvSkuPropertyValueEntity> vvSkuPropertyValueEntities = vvSkuPropertyValueMap.get(vvTradeOrderLineDTO.getSkuId());
@ -334,22 +331,20 @@ public class AppOrderController {
vvTradeOrderDao.insertVvTradeOrder(vvTradeOrderEntity); vvTradeOrderDao.insertVvTradeOrder(vvTradeOrderEntity);
List<VvPromoterTradeOrderLineAwardEntity> vvPromoterTradeOrderLineAwardEntityList = new ArrayList<>(); List<VvPromoterTradeOrderLineAwardEntity> vvPromoterTradeOrderLineAwardEntityList = new ArrayList<>();
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
tradeOrderLineEntity.setTradeOrderId(vvTradeOrderEntity.getId()); tradeOrderLineEntity.setTradeOrderId(vvTradeOrderEntity.getId());
// 如果在奖励金额 // 如果在奖励金额
if(tradeOrderLineEntity.getAwardAmount().compareTo(BigDecimal.ZERO) >0){ if(tradeOrderLineEntity.getAwardAmount().compareTo(BigDecimal.ZERO) >0){
VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardEntity = new VvPromoterTradeOrderLineAwardEntity(); VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardEntity = new VvPromoterTradeOrderLineAwardEntity();
vvPromoterTradeOrderLineAwardEntity.setAwardAmount(vvActivityDTO.getAwardAmount()); vvPromoterTradeOrderLineAwardEntity.setAwardAmount(vvActivityDTO.getAwardAmount());
vvPromoterTradeOrderLineAwardEntity.setTradeOrderId(vvTradeOrderEntity.getId()); vvPromoterTradeOrderLineAwardEntity.setTradeOrderId(vvTradeOrderEntity.getId());
vvPromoterTradeOrderLineAwardEntity.setTradeOrderLineId(tradeOrderLineEntity.getId()); vvPromoterTradeOrderLineAwardEntity.setTradeOrderLineId(tradeOrderLineEntity.getId());
vvPromoterTradeOrderLineAwardEntity.setStatus(OrderStatusEnums.create.getStatus()); vvPromoterTradeOrderLineAwardEntity.setStatus(AwardStatusEnums.create.getStatus());
vvPromoterTradeOrderLineAwardEntityList.add(vvPromoterTradeOrderLineAwardEntity); vvPromoterTradeOrderLineAwardEntityList.add(vvPromoterTradeOrderLineAwardEntity);
} }
vvTradeOrderLineDao.insertOrUpdateVvTradeOrderLine(tradeOrderLineEntity); vvTradeOrderLineDao.insertOrUpdateVvTradeOrderLine(tradeOrderLineEntity);
} }
for (VvTradeOrderLineDTO vvTradeOrderLineDTO : vvOrderRequest.getVvTradeOrderLineDTOList()) { for (VvTradeOrderLineDTO vvTradeOrderLineDTO : vvOrderRequest.getVvTradeOrderLineDTOList()) {
vvSkuDao.updateVvSkuStockSaleCountById(vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getSkuId()); vvSkuDao.updateVvSkuStockSaleCountById(vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getSkuId());
} }