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