From ec9efdc272c5b907789d7ec1bd0522867b66ea90 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 21 Nov 2025 22:54:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/heyu/api/data/enums/AwardStatusEnums.java | 2 -- .../controller/mm/AdminSellerWarehouseController.java | 8 ++++++++ .../com/heyu/api/controller/vv/AppOrderController.java | 9 ++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/api-mapper/src/main/java/com/heyu/api/data/enums/AwardStatusEnums.java b/api-mapper/src/main/java/com/heyu/api/data/enums/AwardStatusEnums.java index 4487d50..27504f5 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/enums/AwardStatusEnums.java +++ b/api-mapper/src/main/java/com/heyu/api/data/enums/AwardStatusEnums.java @@ -5,8 +5,6 @@ package com.heyu.api.data.enums; * create 创建, canceled 取消 , arrive，到账 */ public enum AwardStatusEnums { - - create("create", "创建"), canceled("canceled", "取消"), diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerWarehouseController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerWarehouseController.java index 20a9c5f..6443048 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerWarehouseController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerWarehouseController.java @@ -28,9 +28,17 @@ public class AdminSellerWarehouseController { @Describe("仓库添加") @RequestMapping("/insertOrUpdate") public R add(@RequestBody VvSellerWarehouseEntity warehouseEntity) { + if(warehouseEntity.getContry() == null){ + warehouseEntity.setContry("中国"); + } + vvSellerWarehouseDao.insertOrUpdateVvSellerWarehouse(warehouseEntity); return R.ok().setData(warehouseEntity); } + + } + + diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java index 87a80ce..ac9a4fe 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java @@ -236,9 +236,6 @@ public class AppOrderController { - - - for (VvTradeOrderLineDTO vvTradeOrderLineDTO : vvOrderRequest.getVvTradeOrderLineDTOList()) { VvSkuEntity vvSkuEntity = skuEntityMap.get(vvTradeOrderLineDTO.getSkuId()); List vvSkuPropertyValueEntities = vvSkuPropertyValueMap.get(vvTradeOrderLineDTO.getSkuId()); @@ -334,22 +331,20 @@ public class AppOrderController { vvTradeOrderDao.insertVvTradeOrder(vvTradeOrderEntity); List vvPromoterTradeOrderLineAwardEntityList = new ArrayList<>(); - - for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { tradeOrderLineEntity.setTradeOrderId(vvTradeOrderEntity.getId()); - // 如果在奖励金额 if(tradeOrderLineEntity.getAwardAmount().compareTo(BigDecimal.ZERO) >0){ VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardEntity = new VvPromoterTradeOrderLineAwardEntity(); vvPromoterTradeOrderLineAwardEntity.setAwardAmount(vvActivityDTO.getAwardAmount()); vvPromoterTradeOrderLineAwardEntity.setTradeOrderId(vvTradeOrderEntity.getId()); vvPromoterTradeOrderLineAwardEntity.setTradeOrderLineId(tradeOrderLineEntity.getId()); - vvPromoterTradeOrderLineAwardEntity.setStatus(OrderStatusEnums.create.getStatus()); + vvPromoterTradeOrderLineAwardEntity.setStatus(AwardStatusEnums.create.getStatus()); vvPromoterTradeOrderLineAwardEntityList.add(vvPromoterTradeOrderLineAwardEntity); } vvTradeOrderLineDao.insertOrUpdateVvTradeOrderLine(tradeOrderLineEntity); } + for (VvTradeOrderLineDTO vvTradeOrderLineDTO : vvOrderRequest.getVvTradeOrderLineDTOList()) { vvSkuDao.updateVvSkuStockSaleCountById(vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getSkuId()); }