etrade / dili-xtrade · Commits

Commit b9b348179eb226e7cfab6c2ff9c20e1063c02ef4

Authored by fengliang
1 parent 75148671
build: skipped

update:效验购物车

Inline Side-by-side
Showing 2 changed files with 1 additions and 17 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/dao/ShopCartMessageMapper.java
  View file @b9b3481
... ... @@ -40,5 +40,5 @@ public interface ShopCartMessageMapper extends MybatisMapperSupport {
40 40 List<Long> findCartIdByMessageIds(ShopCartDto shopCartDto);
41 41  
42 42 /** 查询并锁定数据 */
43   - List<ShopCartMessage> selectAndLockByIds(List<Long> messages);
  43 + List<ShopCartMessage> selectAndLockByIds(List<Long> ids);
44 44 }
45 45 \ No newline at end of file
... ...
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
  View file @b9b3481
... ... @@ -1566,22 +1566,6 @@ public class OrderServiceImpl implements OrderService {
1566 1566 }
1567 1567 //配送情况增加计算运费
1568 1568 if(multipleOrderDto.getAchieveType().equals(OrderAchieveType.SELLER_DELIVERY.getCodeInteger())){
1569   - ConfigQueryDto query = new ConfigQueryDto();
1570   - query.setType("TransportFee");
1571   - query.setMarketId(multipleOrderDto.getMarketId());
1572   - BaseOutput<List<ConfigDto>> listBaseOutput = basicDataConfigRpc.queryAll(query);
1573   - Long transportFee = multipleOrderDto.getTransportFee().multiply(NumberTransform.ONE_HUNDERD).longValue();
1574   - Long transportFeeConfig = 0L;
1575   - if("200".equals(listBaseOutput.getCode())){
1576   - List<ConfigDto> configDtos = listBaseOutput.getData();
1577   - if(configDtos!=null&&configDtos.size()>0) {
1578   - ConfigDto configDto = configDtos.get(0);
1579   - transportFeeConfig = Long.parseLong(configDto.getValue());
1580   - }
1581   - }
1582   - if(!transportFee.equals(transportFeeConfig)){
1583   - throw new OrderException(OrderErrorCode.PARAM_ERROR,"运费与设置不一致，请刷新后重试");
1584   - }
1585 1569 totleAmount.add(multipleOrderDto.getTransportFee());
1586 1570 }
1587 1571 //订单总价，与订单总重效验
... ...