From 58e692b4c629d3c9937c2adb9d791c1bce55613d Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 21 Nov 2025 23:13:59 +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 --- .../api/data/dao/vv/VvPromoterBuyerDao.java | 5 ++++ .../api/data/dao/vv/VvSellerWarehouseDao.java | 2 +- .../request/mm/order/VvActivityDTO.java | 8 +++---- .../controller/mm/AdminBuyerController.java | 24 +++++++++---------- .../api/controller/vv/AppOrderController.java | 20 ++++++++++++---- 5 files changed, 35 insertions(+), 24 deletions(-) diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterBuyerDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterBuyerDao.java index d439c5c..662899e 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterBuyerDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterBuyerDao.java @@ -26,6 +26,7 @@ public interface VvPromoterBuyerDao extends BaseMapper { VvPromoterBuyerEntity selectVvPromoterBuyerById(@Param("id") Long id); + Long insertVvPromoterBuyer(VvPromoterBuyerEntity vvPromoterBuyer); @@ -52,4 +53,8 @@ public interface VvPromoterBuyerDao extends BaseMapper { @IF @Column(VvPromoterBuyerEntity.create_timestamp) Long maxCreateTimestamp, @OrderBy @IF @Column(VvPromoterBuyerEntity.create_timestamp) String createTimestampSort ); + + + + List selectVvPromoterBuyerByPromoterId(String promoterId); } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSellerWarehouseDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSellerWarehouseDao.java index d0651f5..fdab627 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSellerWarehouseDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSellerWarehouseDao.java @@ -38,5 +38,5 @@ public interface VvSellerWarehouseDao extends BaseMapper selectVvSellerWarehouseBySellerId(Long sellerId); - List selectVvSellerWarehouseBySellerIdList(@IN List id); + List selectVvSellerWarehouseBySellerIdList(@IN List sellerId); } \ No newline at end of file diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvActivityDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvActivityDTO.java index 6daf162..14c52d1 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvActivityDTO.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvActivityDTO.java @@ -5,19 +5,17 @@ import lombok.Data; @Data public class VvActivityDTO extends VvActivityEntity { - - /*** * 过期时间 */ private Long activityExpiredTime; - - /*** * 推广者id */ - private String promoterId ; + private String promoterId; + + diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminBuyerController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminBuyerController.java index a58daf8..c1277e8 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminBuyerController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminBuyerController.java @@ -6,11 +6,8 @@ import com.heyu.api.alibaba.request.mm.VvBuyerRequest; import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.VvBuyerAddressDao; import com.heyu.api.data.dao.vv.VvBuyerDao; -import com.heyu.api.data.entity.vv.VvBuyerAddressEntity; import com.heyu.api.data.entity.vv.VvBuyerEntity; import com.heyu.api.data.utils.R; -import com.heyu.api.data.utils.SanUtils; -import com.heyu.api.data.utils.StringUtils; import com.heyu.api.utils.ISelect; import com.heyu.api.utils.PPageUtils; import lombok.extern.slf4j.Slf4j; @@ -21,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; -import java.util.Map; @Slf4j @RestController @@ -73,15 +69,15 @@ public class AdminBuyerController { List promoterIds = new ArrayList<>(); - for (VvBuyerEntity buyerEntity : vvBuyerEntities) { - buyerIds.add(buyerEntity.getId()); - if (StringUtils.isNotEmpty(buyerEntity.getPromoterId())) { - promoterIds.add(buyerEntity.getPromoterId()); - } - } - - List vvBuyerAddressEntities = vvBuyerAddressDao.selectMapByBuyerIds(buyerIds); - Map> listMap = SanUtils.groupByFiled2MapList(vvBuyerAddressEntities, VvBuyerAddressEntity::getBuyerId); + // for (VvBuyerEntity buyerEntity : vvBuyerEntities) { + // buyerIds.add(buyerEntity.getId()); + // if (StringUtils.isNotEmpty(buyerEntity.getPromoterId())) { + // promoterIds.add(buyerEntity.getPromoterId()); + // } + // } +// + // List vvBuyerAddressEntities = vvBuyerAddressDao.selectMapByBuyerIds(buyerIds); + // Map> listMap = SanUtils.groupByFiled2MapList(vvBuyerAddressEntities, VvBuyerAddressEntity::getBuyerId); //List vvPromoterEntities = vvPromoterDao.selectVvPromoterByPromoteIds(promoterIds); //Map> vvPromoterGroupBy = SanUtils.groupByFiled2MapList(vvPromoterEntities, VvPromoterEntity::getPromoterId); @@ -131,6 +127,8 @@ public class AdminBuyerController { + + 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 ac9a4fe..61f3adb 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 @@ -116,10 +116,16 @@ public class AppOrderController { @Autowired private VvShoppingCartDao vvShoppingCartDao; + @Autowired + private VvPromoterTradeOrderLineAwardDao vvPromoterTradeOrderLineAwardDao; + + @Autowired + private VvPromoterBuyerDao vvPromoterBuyerDao; + + /*** * https://api.1024api.com/api-interface/app/order/list * - * * http://localhost:8888/app/order/list * * 列表 @@ -234,8 +240,6 @@ public class AppOrderController { Integer batchNum = SanUtils.sum(vvOrderRequest.getVvTradeOrderLineDTOList(), VvTradeOrderLineDTO::getNum); - - for (VvTradeOrderLineDTO vvTradeOrderLineDTO : vvOrderRequest.getVvTradeOrderLineDTOList()) { VvSkuEntity vvSkuEntity = skuEntityMap.get(vvTradeOrderLineDTO.getSkuId()); List vvSkuPropertyValueEntities = vvSkuPropertyValueMap.get(vvTradeOrderLineDTO.getSkuId()); @@ -327,23 +331,29 @@ public class AppOrderController { BigDecimal tradePayAmount = SanUtils.sum(vvTradeOrderLineEntityList, VvTradeOrderLineEntity::getPayAmount); vvTradeOrderEntity.setPayAmount(tradePayAmount); - vvTradeOrderDao.insertVvTradeOrder(vvTradeOrderEntity); List vvPromoterTradeOrderLineAwardEntityList = new ArrayList<>(); + for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { tradeOrderLineEntity.setTradeOrderId(vvTradeOrderEntity.getId()); // 如果在奖励金额 - if(tradeOrderLineEntity.getAwardAmount().compareTo(BigDecimal.ZERO) >0){ + 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(AwardStatusEnums.create.getStatus()); vvPromoterTradeOrderLineAwardEntityList.add(vvPromoterTradeOrderLineAwardEntity); + } vvTradeOrderLineDao.insertOrUpdateVvTradeOrderLine(tradeOrderLineEntity); } + + + List vvPromoterBuyerList = vvPromoterBuyerDao.selectVvPromoterBuyerByPromoterId(vvActivityDTO.getPromoterId()); + for (VvTradeOrderLineDTO vvTradeOrderLineDTO : vvOrderRequest.getVvTradeOrderLineDTOList()) { vvSkuDao.updateVvSkuStockSaleCountById(vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getSkuId());