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

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

@@ -3229,7 +3229,7 @@ public class OrderServiceImpl implements OrderService {
         orderSendCusParams.put("merchName", order.getMerchName());
         orderSendCusParams.put("thirdPartyMerchCode", store.getThirdPartyMerchCode());
         orderSendCusParams.put("thirdPartyMerchName", store.getThirdPartyMerchName());
-        orderSendCusParams.put("outTradeNo", order.getMerchOrderSn());
+        orderSendCusParams.put("outTradeNo", order.getOrder_sn());
         orderSendCusParams.put("transactionId", order.getPayTransactionId());
         orderSendCusParams.put("subOrderId", "");   // ccnet原逻辑没有对该字段赋值
         orderSendCusParams.put("subOrderNo", order.getOrder_sn());
@@ -4282,7 +4282,7 @@ public class OrderServiceImpl implements OrderService {
             if (Objects.nonNull(activity)) {
                 good.setActivity(null);
             }
-            BigDecimal actualPaymentAmount = good.getActualPaymentAmount();
+            BigDecimal actualPaymentAmount = good.getActualPaymentAmount().multiply(BigDecimal.valueOf(good.getSellVolume()));
             good.setActualPaymentAmount(good.getRetailPrice());
 
             QueryGoodsVO queryGoodsVo = new QueryGoodsVO();
@@ -4291,7 +4291,7 @@ public class OrderServiceImpl implements OrderService {
             queryGoodsVo.setStoreId(Long.parseLong(storeId));
             queryGoodsVo.setDisCountedPrice(BigDecimal.ZERO);
             queryGoodsVo.setTotalPrice(actualPaymentAmount);
-            orderTotalPrice = orderTotalPrice.add(good.getRetailPrice());
+            orderTotalPrice = orderTotalPrice.add(good.getRetailPrice().multiply(BigDecimal.valueOf(good.getSellVolume())));
             goodsVos.add(queryGoodsVo);
         }
         calculateOrderDiscountPriceResponseVO.setOrderTotalPrice(orderTotalPrice);
@@ -4608,8 +4608,8 @@ public class OrderServiceImpl implements OrderService {
             queryGoodsVo.setSku(good.getGoodsSn());
             queryGoodsVo.setStoreId(Long.parseLong(storeId));
             queryGoodsVo.setDisCountedPrice(BigDecimal.ZERO);
-            queryGoodsVo.setTotalPrice(good.getActualPaymentAmount());
-            orderTotalPrice = orderTotalPrice.add(good.getActualPaymentAmount());
+            queryGoodsVo.setTotalPrice(good.getActualPaymentAmount().multiply(BigDecimal.valueOf(good.getSellVolume())));
+            orderTotalPrice = orderTotalPrice.add(good.getActualPaymentAmount().multiply(BigDecimal.valueOf(good.getSellVolume())));
             goodsVos.add(queryGoodsVo);
         }
         calculateOrderDiscountPriceResponseVO.setOrderTotalPrice(orderTotalPrice);
@@ -4747,7 +4747,8 @@ public class OrderServiceImpl implements OrderService {
             if (!promotionSkuList.contains(sku)) {
                 if (!CollectionUtils.isEmpty(scoreDeductionAllowSkuList) && CollectionUtils.isEmpty(scoreDeductionRejectSkuList)) {
                     if (scoreDeductionAllowSkuList.contains(sku)) {
-                        BigDecimal skuActualPaymentAmount = goodsDetailsDto.getActualPaymentAmount();
+                        BigDecimal skuActualPaymentAmount = goodsDetailsDto.getActualPaymentAmount()
+                                .multiply(BigDecimal.valueOf(goodsDetailsDto.getSellVolume()));
                         skuTotalPrice = skuTotalPrice.add(skuActualPaymentAmount);
                     }
                 }
@@ -4820,7 +4821,8 @@ public class OrderServiceImpl implements OrderService {
                     String sku = goodsDetailsDto.getGoodsSn();
                     String prodBarcode = goodsDetailsDto.getProdBarcode();
                     // 此字段 = 零售价 - 其他活动优惠金额
-                    BigDecimal actualPaymentAmount = goodsDetailsDto.getActualPaymentAmount();
+                    BigDecimal actualPaymentAmount = goodsDetailsDto.getActualPaymentAmount()
+                            .multiply(BigDecimal.valueOf(goodsDetailsDto.getSellVolume()));
                     // 当前商品最大支持抵扣的金额
                     BigDecimal currentSkuMaxDeductionPrice = actualPaymentAmount.multiply(BigDecimal.valueOf(goodsDetailsDto.getSellVolume()))
                                                                                 .multiply(scoreRatio).setScale(0, BigDecimal.ROUND_FLOOR);
@@ -5231,7 +5233,7 @@ public class OrderServiceImpl implements OrderService {
         /*GoodsEntity goodsEntity = goodsService.queryObject(goodsDto.getId().intValue());
         BigDecimal goodsTax = CalculateTax.calculateFinalTax(goodsEntity, goodsDto.getStoreRetailPrice(), goodsService).setScale(3, RoundingMode.HALF_UP);
         goodsTax = goodsTax.multiply(number).setScale(2, RoundingMode.HALF_UP);*/
-        orderGoodsVo.setTaxPrice(goodsDto.getGoodsTaxes());
+        orderGoodsVo.setTaxPrice(goodsDto.getGoodsTaxes().divide(BigDecimal.valueOf(goodsDto.getSellVolume()), 3, BigDecimal.ROUND_HALF_UP));
 
         return orderGoodsVo;
     }

kmall-admin/src/main/resources/conf/fastdfs.properties

@@ -83,7 +83,7 @@ base_path=/home/logs/fastdfs
 
 #tracker server\u662FFastDFS\u6587\u4EF6\u7CFB\u7EDF\u7684\u534F\u8C03\u8005,\u5176\u4E3B\u8981\u4F5C\u7528\u662F\u8D1F\u8F7D\u5747\u8861\u548C\u8C03\u5EA6\u3002
 #Tracker server\u5728\u5185\u5B58\u4E2D\u8BB0\u5F55\u5206\u7EC4\u548CStorage server\u7684\u72B6\u6001\u7B49\u4FE1\u606F\uFF0C\u4E0D\u8BB0\u5F55\u6587\u4EF6\u7D22\u5F15\u4FE1\u606F
-tracker_server=172.18.246.243:22122
+tracker_server=120.76.119.218:22122
 
 log_level=info
 
@@ -98,7 +98,7 @@ use_storage_id=false
 storage_ids_filename=storage_ids.conf
 
 #HTTP \u670D\u52A1\u5668\u5730\u5740
-http.tracket_nginx_addr=172.18.246.243
+http.tracket_nginx_addr=120.76.119.218
 
 #HTTP \u670D\u52A1\u5668\u7AEF\u53E3\u53F7
 http.tracker_server_port=80