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-22 11:04:08 +08:00
parent 4f8517d71b
commit f9eed324c3
2 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
View File

@ -267,7 +267,6 @@ public class AdminOrderController {
tradeOrderLineEntity.setGmtToShipping(new Date()); tradeOrderLineEntity.setGmtToShipping(new Date());
tradeOrderLineEntity.setSellerId(vvOrderRequest.getSellerId()); tradeOrderLineEntity.setSellerId(vvOrderRequest.getSellerId());
vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity); vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
vvTradeOrderConvertService.addOrderLineStatusLog( vvTradeOrderConvertService.addOrderLineStatusLog(
tradeOrderLineEntity.getId(), tradeOrderLineEntity.getId(),

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

@ -33,6 +33,7 @@ import com.heyu.api.utils.PPageUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.MessageDeliveryMode; import org.springframework.amqp.core.MessageDeliveryMode;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -122,6 +123,8 @@ public class AppOrderController {
@Autowired @Autowired
private VvPromoterBuyerDao vvPromoterBuyerDao; private VvPromoterBuyerDao vvPromoterBuyerDao;
@Autowired
private VvPromoterTradeOrderAwardDao vvPromoterTradeOrderAwardDao;
/*** /***
* https://api.1024api.com/api-interface/app/order/list * https://api.1024api.com/api-interface/app/order/list
@ -296,6 +299,7 @@ public class AppOrderController {
if (vvActivityDTO != null) { if (vvActivityDTO != null) {
vvTradeOrderLineEntity.setAwardAmount(vvActivityDTO.getAwardAmount()); vvTradeOrderLineEntity.setAwardAmount(vvActivityDTO.getAwardAmount());
vvTradeOrderLineEntity.setDiscountAmount(vvActivityDTO.getDiscountAmount()); vvTradeOrderLineEntity.setDiscountAmount(vvActivityDTO.getDiscountAmount());
vvTradeOrderLineEntity.setPromoterId(vvActivityDTO.getPromoterId());
payAmount = BigDecimalUtil.subtract(vvSkuEntity.getPromotionPrice(), vvActivityDTO.getDiscountAmount()); payAmount = BigDecimalUtil.subtract(vvSkuEntity.getPromotionPrice(), vvActivityDTO.getDiscountAmount());
} }
vvTradeOrderLineEntity.setPayAmount(payAmount); vvTradeOrderLineEntity.setPayAmount(payAmount);
@ -306,6 +310,7 @@ public class AppOrderController {
VvTradeOrderEntity vvTradeOrderEntity = new VvTradeOrderEntity(); VvTradeOrderEntity vvTradeOrderEntity = new VvTradeOrderEntity();
VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerById(vvOrderRequest.getBuyerId()); VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerById(vvOrderRequest.getBuyerId());
//创建时间 //创建时间
vvTradeOrderEntity.setCreateTime(new Date()); vvTradeOrderEntity.setCreateTime(new Date());
vvTradeOrderEntity.setModifyTime(new Date()); vvTradeOrderEntity.setModifyTime(new Date());
@ -332,7 +337,6 @@ public class AppOrderController {
BigDecimal tradePayAmount = SanUtils.sum(vvTradeOrderLineEntityList, VvTradeOrderLineEntity::getPayAmount); BigDecimal tradePayAmount = SanUtils.sum(vvTradeOrderLineEntityList, VvTradeOrderLineEntity::getPayAmount);
vvTradeOrderEntity.setPayAmount(tradePayAmount); vvTradeOrderEntity.setPayAmount(tradePayAmount);
vvTradeOrderDao.insertVvTradeOrder(vvTradeOrderEntity); vvTradeOrderDao.insertVvTradeOrder(vvTradeOrderEntity);
List<VvPromoterTradeOrderLineAwardEntity> vvPromoterTradeOrderLineAwardEntityList = new ArrayList<>(); List<VvPromoterTradeOrderLineAwardEntity> vvPromoterTradeOrderLineAwardEntityList = new ArrayList<>();
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
@ -340,20 +344,65 @@ public class AppOrderController {
// 如果在奖励金额 // 如果在奖励金额
if (tradeOrderLineEntity.getAwardAmount().compareTo(BigDecimal.ZERO) > 0) { if (tradeOrderLineEntity.getAwardAmount().compareTo(BigDecimal.ZERO) > 0) {
VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardEntity = new VvPromoterTradeOrderLineAwardEntity(); VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardEntity = new VvPromoterTradeOrderLineAwardEntity();
vvPromoterTradeOrderLineAwardEntity.setPromoterId(tradeOrderLineEntity.getPromoterId());
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.setWasBuyerId(tradeOrderLineEntity.getBuyerId());
vvPromoterTradeOrderLineAwardEntity.setWasBuyerName(tradeOrderLineEntity.getBuyerName());
vvPromoterTradeOrderLineAwardEntity.setWasBuyerPhone(tradeOrderLineEntity.getBuyerPhone());
vvPromoterTradeOrderLineAwardEntity.setWasBuyerWeixin(tradeOrderLineEntity.getBuyerWeixin());
vvPromoterTradeOrderLineAwardEntity.setStatus(AwardStatusEnums.create.getStatus()); vvPromoterTradeOrderLineAwardEntity.setStatus(AwardStatusEnums.create.getStatus());
vvPromoterTradeOrderLineAwardEntityList.add(vvPromoterTradeOrderLineAwardEntity); vvPromoterTradeOrderLineAwardEntityList.add(vvPromoterTradeOrderLineAwardEntity);
} }
vvTradeOrderLineDao.insertOrUpdateVvTradeOrderLine(tradeOrderLineEntity); vvTradeOrderLineDao.insertOrUpdateVvTradeOrderLine(tradeOrderLineEntity);
} }
List<VvPromoterBuyerEntity> vvPromoterBuyerList = vvPromoterBuyerDao.selectVvPromoterBuyerByPromoterId(vvActivityDTO.getPromoterId()); List<VvPromoterBuyerEntity> vvPromoterBuyerList = vvPromoterBuyerDao.selectVvPromoterBuyerByPromoterId(vvActivityDTO.getPromoterId());
if (CollectionUtils.isNotEmpty(vvPromoterBuyerList)
&& CollectionUtils.isNotEmpty(vvPromoterTradeOrderLineAwardEntityList)) {
for (int i = 0; i < vvPromoterBuyerList.size(); i++) {
VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAwardEntity = new VvPromoterTradeOrderAwardEntity();
VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardIndex_0 = vvPromoterTradeOrderLineAwardEntityList.get(0);
VvPromoterBuyerEntity vvPromoterBuyer = vvPromoterBuyerList.get(i);
vvPromoterTradeOrderAwardEntity.setPromoterBuyerId(vvPromoterBuyer.getPromoterBuyerId());
vvPromoterTradeOrderAwardEntity.setPromoterBuyerName(vvPromoterBuyer.getPromoterBuyerName());
vvPromoterTradeOrderAwardEntity.setPromoterBuyerPhone(vvPromoterBuyer.getPromoterBuyerPhone());
vvPromoterTradeOrderAwardEntity.setPromoterBuyerWeixin(vvPromoterBuyer.getPromoterBuyerWeixin());
BeanUtils.copyProperties(vvPromoterTradeOrderLineAwardIndex_0, vvPromoterTradeOrderAwardEntity);
vvPromoterTradeOrderAwardDao.insertVvPromoterTradeOrderAward(vvPromoterTradeOrderAwardEntity);
BigDecimal tradeOrderAward = BigDecimal.ZERO;
for (VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardEntity : vvPromoterTradeOrderLineAwardEntityList) {
BigDecimal awardAmount = vvPromoterTradeOrderLineAwardEntity.getAwardAmount();
BigDecimal awardAmountSingle = BigDecimalUtil.divide(awardAmount, new BigDecimal(vvPromoterBuyerList.size()));
VvPromoterTradeOrderLineAwardEntity promoterTradeOrderLineAwardNew = new VvPromoterTradeOrderLineAwardEntity();
BeanUtils.copyProperties(vvPromoterTradeOrderLineAwardEntity, promoterTradeOrderLineAwardNew);
BigDecimal sum = BigDecimal.ZERO;
if (i == vvPromoterBuyerList.size() - 1) {
promoterTradeOrderLineAwardNew.setAwardAmount(awardAmount.subtract(sum));
} else {
sum = sum.add(awardAmountSingle);
promoterTradeOrderLineAwardNew.setAwardAmount(awardAmountSingle);
}
promoterTradeOrderLineAwardNew.setPromoterBuyerId(vvPromoterBuyer.getPromoterBuyerId());
promoterTradeOrderLineAwardNew.setPromoterBuyerName(vvPromoterBuyer.getPromoterBuyerName());
promoterTradeOrderLineAwardNew.setPromoterBuyerPhone(vvPromoterBuyer.getPromoterBuyerPhone());
promoterTradeOrderLineAwardNew.setPromoterBuyerWeixin(vvPromoterBuyer.getPromoterBuyerWeixin());
tradeOrderAward = tradeOrderAward.add(promoterTradeOrderLineAwardNew.getAwardAmount());
vvPromoterTradeOrderLineAwardDao.insertVvPromoterTradeOrderLineAward(vvPromoterTradeOrderLineAwardEntity);
}
// 更新奖励金额
vvPromoterTradeOrderAwardEntity.setAwardAmount(tradeOrderAward);
vvPromoterTradeOrderAwardDao.insertVvPromoterTradeOrderAward(vvPromoterTradeOrderAwardEntity);
}
}
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());
@ -397,7 +446,6 @@ public class AppOrderController {
}); });
} }
WxPayVO vo = new WxPayVO(); WxPayVO vo = new WxPayVO();
Long timeStamp = System.currentTimeMillis() / 1000; Long timeStamp = System.currentTimeMillis() / 1000;
String nonceStr = UUID.randomUUID().toString().replaceAll("-", "").substring(0, 32); String nonceStr = UUID.randomUUID().toString().replaceAll("-", "").substring(0, 32);