etrade / dili-xtrade · Commits

Commit b995977efdd23ef0465446798acb6a4bc8466175

Authored by fengliang
1 parent d3937f02
build: skipped

update:多店铺运费只分配第一家

Inline Side-by-side
Showing 2 changed files with 1 additions and 2 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderController.java
  View file @b995977
@@ -811,7 +811,6 @@ public class OrderController { @@ -811,7 +811,6 @@ public class OrderController {
811 return Message.failure(OrderErrorCode.PARAM_ERROR,"市场不能为空"); 811 return Message.failure(OrderErrorCode.PARAM_ERROR,"市场不能为空");
812 } 812 }
813 ConfigQueryDto query = new ConfigQueryDto(); 813 ConfigQueryDto query = new ConfigQueryDto();
814 - query.setName("甄选运费");  
815 query.setMarketId(order.getMarketId()); 814 query.setMarketId(order.getMarketId());
816 query.setType("TransportFee"); 815 query.setType("TransportFee");
817 BaseOutput<List<ConfigDto>> listBaseOutput = basicDataConfigRpc.queryAll(query); 816 BaseOutput<List<ConfigDto>> listBaseOutput = basicDataConfigRpc.queryAll(query);
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderGoodsServiceImpl.java
  View file @b995977
@@ -164,7 +164,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService { @@ -164,7 +164,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
164 //配送情况增加计算运费 164 //配送情况增加计算运费
165 if(buyerOrderDto.getAchieveType().equals(OrderAchieveType.SELLER_DELIVERY.getCodeInteger())&&transportFeeFlag){ 165 if(buyerOrderDto.getAchieveType().equals(OrderAchieveType.SELLER_DELIVERY.getCodeInteger())&&transportFeeFlag){
166 ConfigQueryDto query = new ConfigQueryDto(); 166 ConfigQueryDto query = new ConfigQueryDto();
167 - query.setName("甄选运费"); 167 + query.setType("TransportFee");
168 query.setMarketId(buyerOrderDto.getMarketId()); 168 query.setMarketId(buyerOrderDto.getMarketId());
169 BaseOutput<List<ConfigDto>> listBaseOutput = basicDataConfigRpc.queryAll(query); 169 BaseOutput<List<ConfigDto>> listBaseOutput = basicDataConfigRpc.queryAll(query);
170 Long transportFee = buyerOrderDto.getTransportFee().multiply(NumberTransform.ONE_HUNDERD).longValue(); 170 Long transportFee = buyerOrderDto.getTransportFee().multiply(NumberTransform.ONE_HUNDERD).longValue();