Merge branch 'master' of zyh/kmall-haikong into master

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -4405,7 +4405,7 @@ public class OrderServiceImpl implements OrderService {
                 good.setActivity(null);
             }
             BigDecimal actualPaymentAmount = good.getActualPaymentAmount().multiply(BigDecimal.valueOf(good.getSellVolume()));
-            good.setActualPaymentAmount(good.getRetailPrice());
+            good.setActualPaymentAmount(good.getRetailPrice().multiply(BigDecimal.valueOf(good.getSellVolume())));
 
             QueryGoodsVO queryGoodsVo = new QueryGoodsVO();
             BeanUtils.copyProperties(good, queryGoodsVo);
@@ -4898,14 +4898,12 @@ public class OrderServiceImpl implements OrderService {
             if (!promotionSkuList.contains(sku)) {
                 if (!CollectionUtils.isEmpty(scoreDeductionAllowSkuList) && CollectionUtils.isEmpty(scoreDeductionRejectSkuList)) {
                     if (scoreDeductionAllowSkuList.contains(sku)) {
-                        BigDecimal skuActualPaymentAmount = goodsDetailsDto.getActualPaymentAmount()
-                                .multiply(BigDecimal.valueOf(goodsDetailsDto.getSellVolume()));
+                        BigDecimal skuActualPaymentAmount = goodsDetailsDto.getActualPaymentAmount();
                         skuTotalPrice = skuTotalPrice.add(skuActualPaymentAmount);
                     }
                 } else if (CollectionUtils.isEmpty(scoreDeductionAllowSkuList) && !CollectionUtils.isEmpty(scoreDeductionRejectSkuList)) {
                     if (!scoreDeductionRejectSkuList.contains(sku)) {
-                        BigDecimal skuActualPaymentAmount = goodsDetailsDto.getActualPaymentAmount()
-                                .multiply(BigDecimal.valueOf(goodsDetailsDto.getSellVolume()));
+                        BigDecimal skuActualPaymentAmount = goodsDetailsDto.getActualPaymentAmount();
                         skuTotalPrice = skuTotalPrice.add(skuActualPaymentAmount);
                     }
                 }