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 23:13:59 +08:00
parent d3f9b23a83
commit 58e692b4c6
5 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterBuyerDao.java
View File

@ -26,6 +26,7 @@ public interface VvPromoterBuyerDao extends BaseMapper<VvPromoterBuyerEntity> {
VvPromoterBuyerEntity selectVvPromoterBuyerById(@Param("id") Long id);
Long insertVvPromoterBuyer(VvPromoterBuyerEntity vvPromoterBuyer);
@ -52,4 +53,8 @@ public interface VvPromoterBuyerDao extends BaseMapper<VvPromoterBuyerEntity> {
@IF @Column(VvPromoterBuyerEntity.create_timestamp) Long maxCreateTimestamp,
@OrderBy @IF @Column(VvPromoterBuyerEntity.create_timestamp) String createTimestampSort
);
List<VvPromoterBuyerEntity> selectVvPromoterBuyerByPromoterId(String promoterId);
}

2
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSellerWarehouseDao.java
View File

@ -38,5 +38,5 @@ public interface VvSellerWarehouseDao extends BaseMapper<VvSellerWarehouseEntity
List<VvSellerWarehouseEntity> selectVvSellerWarehouseBySellerId(Long sellerId);
List<VvSellerWarehouseEntity> selectVvSellerWarehouseBySellerIdList(@IN List<Long> id);
List<VvSellerWarehouseEntity> selectVvSellerWarehouseBySellerIdList(@IN List<Long> sellerId);
}

8
api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvActivityDTO.java
View File

@ -5,19 +5,17 @@ import lombok.Data;
@Data
public class VvActivityDTO extends VvActivityEntity {
/***
* 过期时间
*/
private Long activityExpiredTime;
/***
* 推广者id
*/
private String promoterId ;
private String promoterId;

24
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminBuyerController.java
View File

@ -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<String> promoterIds = new ArrayList<>();
for (VvBuyerEntity buyerEntity : vvBuyerEntities) {
buyerIds.add(buyerEntity.getId());
if (StringUtils.isNotEmpty(buyerEntity.getPromoterId())) {
promoterIds.add(buyerEntity.getPromoterId());
}
}
List<VvBuyerAddressEntity> vvBuyerAddressEntities = vvBuyerAddressDao.selectMapByBuyerIds(buyerIds);
Map<Long, List<VvBuyerAddressEntity>> listMap = SanUtils.groupByFiled2MapList(vvBuyerAddressEntities, VvBuyerAddressEntity::getBuyerId);
// for (VvBuyerEntity buyerEntity : vvBuyerEntities) {
// buyerIds.add(buyerEntity.getId());
// if (StringUtils.isNotEmpty(buyerEntity.getPromoterId())) {
// promoterIds.add(buyerEntity.getPromoterId());
// }
// }
//
// List<VvBuyerAddressEntity> vvBuyerAddressEntities = vvBuyerAddressDao.selectMapByBuyerIds(buyerIds);
// Map<Long, List<VvBuyerAddressEntity>> listMap = SanUtils.groupByFiled2MapList(vvBuyerAddressEntities, VvBuyerAddressEntity::getBuyerId);
//List<VvPromoterEntity> vvPromoterEntities = vvPromoterDao.selectVvPromoterByPromoteIds(promoterIds);
//Map<String, List<VvPromoterEntity>> vvPromoterGroupBy = SanUtils.groupByFiled2MapList(vvPromoterEntities, VvPromoterEntity::getPromoterId);
@ -131,6 +127,8 @@ public class AdminBuyerController {

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

@ -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<VvSkuPropertyValueEntity> 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<VvPromoterTradeOrderLineAwardEntity> 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<VvPromoterBuyerEntity> vvPromoterBuyerList = vvPromoterBuyerDao.selectVvPromoterBuyerByPromoterId(vvActivityDTO.getPromoterId());
for (VvTradeOrderLineDTO vvTradeOrderLineDTO : vvOrderRequest.getVvTradeOrderLineDTOList()) {
vvSkuDao.updateVvSkuStockSaleCountById(vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getNum(), vvTradeOrderLineDTO.getSkuId());