Commit 00802138 authored by shiyu's avatar shiyu

自购价格2

parent 60265ba9
...@@ -38,6 +38,8 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -38,6 +38,8 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.*; import java.util.*;
...@@ -437,7 +439,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService { ...@@ -437,7 +439,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
distributionOrder.setBuyerOpenid(dto.getBuyerOpenid()); distributionOrder.setBuyerOpenid(dto.getBuyerOpenid());
distributionOrder.setShopId(CommConsts.SYSTEM_ACCOUNT); distributionOrder.setShopId(CommConsts.SYSTEM_ACCOUNT);
distributionOrder.setSellerId(CommConsts.SYSTEM_ACCOUNT); distributionOrder.setSellerId(CommConsts.SYSTEM_ACCOUNT);
distributionOrder.setAmount(supplierItem.getDistributionPrice());
//计算商家自购价
BigDecimal bigDecimal = new BigDecimal(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice())).multiply(supplierItem.getRebate()).divide(new BigDecimal("100"));
BigDecimal buyPrice = new BigDecimal(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice())).subtract(bigDecimal).setScale(2,BigDecimal.ROUND_UP);
distributionOrder.setAmount(PriceUtil.convertPriceFromStr(buyPrice.toPlainString()));
distributionOrder.setAddressId(dto.getAddressId()); distributionOrder.setAddressId(dto.getAddressId());
distributionOrder.setReceiverAddress(dto.getReceiverAddress()); distributionOrder.setReceiverAddress(dto.getReceiverAddress());
distributionOrder.setReceiverName(dto.getReceiverName()); distributionOrder.setReceiverName(dto.getReceiverName());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment