update:运费效验与计算

fengliang
1 parent 5fb74499
Showing 8 changed files with 250 additions and 35 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderController.java
etrade-order/src/main/java/com/diligrp/etrade/order/dao/OrderMapper.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderTransportFeeQuery.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/OrderGoodsService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/OrderService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderGoodsServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderMapper.xml
@@ -28,6 +28,7 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jodd.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RBucket;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -59,9 +60,6 @@ public class OrderController {
     @Resource
     private RedissonClient redissonClient;
-    @Resource
-    private BasicDataConfigRpc basicDataConfigRpc;
-
     /**
      * 买家创建订单
      * @return
@@ -787,24 +785,20 @@ public class OrderController {
      * @return
      */
     @RequestMapping(value = "/getTransportFee",method = {RequestMethod.POST},produces="application/json;charset=UTF-8")
-    public Message<TransportFeeDto> getTransportFee(@RequestBody OrderDto order){
+    public Message<TransportFeeDto> getTransportFee(@RequestBody OrderTransportFeeQuery order){
         try{
-            if(order.getMarketId()==null){
-                return Message.failure(OrderErrorCode.PARAM_ERROR,"市场不能为空");
+            if(order.getBuyerId() == null){
+                return Message.failure(OrderErrorCode.PARAM_ERROR,"买家不能为空");
             }
-            ConfigQueryDto query = new ConfigQueryDto();
-            query.setMarketId(order.getMarketId());
-            query.setType("TransportFee");
-            BaseOutput<List<ConfigDto>> listBaseOutput = basicDataConfigRpc.queryAll(query);
-            if("200".equals(listBaseOutput.getCode())){
-                List<ConfigDto> configDtos = listBaseOutput.getData();
-                if(configDtos!=null&&configDtos.size()>0) {
-                    ConfigDto configDto = configDtos.get(0);
-                    TransportFeeDto transportFeeDto = new TransportFeeDto();
-                    long l = Long.parseLong(configDto.getValue());
-                    transportFeeDto.setTransportFee(l);
-                    return Message.success(transportFeeDto);
-                }
+            if (StringUtils.isBlank(order.getAchieveAddress())){
+                return Message.failure(OrderErrorCode.PARAM_ERROR,"收货地址不能为空");
+            }
+            if (order.getTotleAmount() == null){
+                return Message.failure(OrderErrorCode.PARAM_ERROR,"商品总价不能为空");
+            }
+            TransportFeeDto transportFeeDto = orderService.getTransportFee(order);
+            if(transportFeeDto!=null){
+                return Message.success(transportFeeDto);
             }
             return Message.success(new TransportFeeDto());
         }catch (PlatformServiceException pe) {
@@ -131,4 +131,11 @@ public interface OrderMapper extends MybatisMapperSupport {
      * @param ids
      */
     void updateDeductState(@Param("ids")List<Long> ids);
+
+    /**
+     * 查询是否存在已支付相同配送地址订单
+     * @param orderTransportFeeQuery
+     * @return
+     */
+    Integer selectOrderByTransportFee(OrderTransportFeeQuery orderTransportFeeQuery);
 }
+package com.diligrp.etrade.order.domain;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+public class OrderTransportFeeQuery {
+    /**
+     * 买方客户id
+     */
+    private Long buyerId;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 市场id
+     */
+    private Long marketId;
+
+    /**
+     * 开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 收货地址
+     */
+    private String achieveAddress;
+
+    /**
+     * 订单总金额
+     */
+    private BigDecimal totleAmount;
+
+    public Long getBuyerId() {
+        return buyerId;
+    }
+
+    public void setBuyerId(Long buyerId) {
+        this.buyerId = buyerId;
+    }
+
+    public Long getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Long shopId) {
+        this.shopId = shopId;
+    }
+
+    public Long getMarketId() {
+        return marketId;
+    }
+
+    public void setMarketId(Long marketId) {
+        this.marketId = marketId;
+    }
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+
+    public LocalDateTime getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(LocalDateTime endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getAchieveAddress() {
+        return achieveAddress;
+    }
+
+    public void setAchieveAddress(String achieveAddress) {
+        this.achieveAddress = achieveAddress;
+    }
+
+    public BigDecimal getTotleAmount() {
+        return totleAmount;
+    }
+
+    public void setTotleAmount(BigDecimal totleAmount) {
+        this.totleAmount = totleAmount;
+    }
+}
 package com.diligrp.etrade.order.service;
 import com.diligrp.etrade.order.domain.OrderCreateDto;
+import com.diligrp.etrade.order.domain.OrderDto;
 import com.diligrp.etrade.order.domain.ProductDto;
 import com.diligrp.etrade.order.model.Order;
 import com.diligrp.etrade.order.model.OrderGoods;
+import com.diligrp.etrade.shop.domain.response.ShopExpressVo;
 import com.diligrp.etrade.shop.domain.response.ShopVo;
 import org.springframework.transaction.annotation.Transactional;
@@ -256,4 +256,6 @@ public interface OrderService {
      * 获取订单状态
      */
     OrderDto checkOrderState(String code);
+
+    TransportFeeDto getTransportFee(OrderTransportFeeQuery order);
 }
@@ -22,6 +22,7 @@ import com.diligrp.etrade.rpc.type.CustomerState;
 import com.diligrp.etrade.shop.domain.request.ShopCo;
 import com.diligrp.etrade.shop.domain.request.StockDeductRequest;
 import com.diligrp.etrade.shop.domain.response.ProductDetailVo;
+import com.diligrp.etrade.shop.domain.response.ShopExpressVo;
 import com.diligrp.etrade.shop.domain.response.ShopVo;
 import com.diligrp.etrade.shop.exception.InsufficientStockException;
 import com.diligrp.etrade.shop.exception.StockNotFoundException;
@@ -163,22 +164,22 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         }
         //配送情况增加计算运费
         if(buyerOrderDto.getAchieveType().equals(OrderAchieveType.SELLER_DELIVERY.getCodeInteger())&&transportFeeFlag){
-            ConfigQueryDto query = new ConfigQueryDto();
-            query.setType("TransportFee");
-            query.setMarketId(buyerOrderDto.getMarketId());
-            BaseOutput<List<ConfigDto>> listBaseOutput = basicDataConfigRpc.queryAll(query);
-            Long transportFee = buyerOrderDto.getTransportFee().multiply(NumberTransform.ONE_HUNDERD).longValue();
-            Long transportFeeConfig = 0L;
-            if("200".equals(listBaseOutput.getCode())){
-                List<ConfigDto> configDtos = listBaseOutput.getData();
-                if(configDtos!=null&&configDtos.size()>0) {
-                    ConfigDto configDto = configDtos.get(0);
-                    transportFeeConfig = Long.parseLong(configDto.getValue());
-                }
-            }
-            if(!transportFee.equals(transportFeeConfig)){
-                throw new OrderException(OrderErrorCode.PARAM_ERROR,"运费与设置不一致，请刷新后重试");
-            }
+//            ConfigQueryDto query = new ConfigQueryDto();
+//            query.setType("TransportFee");
+//            query.setMarketId(buyerOrderDto.getMarketId());
+//            BaseOutput<List<ConfigDto>> listBaseOutput = basicDataConfigRpc.queryAll(query);
+//            Long transportFee = buyerOrderDto.getTransportFee().multiply(NumberTransform.ONE_HUNDERD).longValue();
+//            Long transportFeeConfig = 0L;
+//            if("200".equals(listBaseOutput.getCode())){
+//                List<ConfigDto> configDtos = listBaseOutput.getData();
+//                if(configDtos!=null&&configDtos.size()>0) {
+//                    ConfigDto configDto = configDtos.get(0);
+//                    transportFeeConfig = Long.parseLong(configDto.getValue());
+//                }
+//            }
+//            if(!transportFee.equals(transportFeeConfig)){
+//                throw new OrderException(OrderErrorCode.PARAM_ERROR,"运费与设置不一致，请刷新后重试");
+//            }
             allmount = allmount.add(buyerOrderDto.getTransportFee());
         }
         //效验库存
@@ -42,8 +42,13 @@ import com.diligrp.etrade.rpc.util.Constants;
 import com.diligrp.etrade.shared.SharedConfiguration;
 import com.diligrp.etrade.shared.domain.OrderQrCode;
 import com.diligrp.etrade.shop.domain.request.ShopCo;
+import com.diligrp.etrade.shop.domain.request.ShopExpressQueryCo;
+import com.diligrp.etrade.shop.domain.response.ShopExpressVo;
 import com.diligrp.etrade.shop.domain.response.ShopVo;
+import com.diligrp.etrade.shop.service.ShopExpressSettingService;
 import com.diligrp.etrade.shop.service.ShopService;
+import com.diligrp.etrade.shop.type.ExpressCondition;
+import com.diligrp.etrade.shop.type.ExpressType;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -82,6 +87,9 @@ public class OrderServiceImpl implements OrderService {
     private OrderGoodsService orderGoodsService;
     @Resource
+    private ShopExpressSettingService shopExpressSettingService;
+
+    @Resource
     private OrderPaymentService orderPaymentService;
     @Resource
@@ -133,6 +141,7 @@ public class OrderServiceImpl implements OrderService {
         orderCreateDto.setShopCustomerId(shop.getCustomerId());
         orderCreateDto.setShopName(shop.getName());
         orderCreateDto.setShopCustomerName(shop.getCustomerName());
+        setTransportFee(orderCreateDto,transportFeeFlag);
         //效验买方地址是否可配送
         orderDeliveryService.checkPersonContact(orderCreateDto);
         //验证订单商品总重量与订单商品总价格
@@ -144,6 +153,33 @@ public class OrderServiceImpl implements OrderService {
         return order;
     }
+    private void setTransportFee(OrderCreateDto orderCreateDto, Boolean transportFeeFlag) {
+        if(!transportFeeFlag || orderCreateDto.getAchieveType().equals(OrderAchieveType.BUYER_SELF.getCodeInteger())){
+            return;
+        }
+        OrderTransportFeeQuery orderTransportFeeQuery = new OrderTransportFeeQuery();
+        orderTransportFeeQuery.setShopId(orderCreateDto.getShopId());
+        orderTransportFeeQuery.setBuyerId(orderCreateDto.getBuyerId());
+        orderTransportFeeQuery.setMarketId(orderCreateDto.getMarketId());
+        orderTransportFeeQuery.setAchieveAddress(orderCreateDto.getDelivery().getAddress());
+        if(orderCreateDto.getTransportFee()!=null){
+            orderTransportFeeQuery.setTotleAmount(orderCreateDto.getTotleAmount().subtract(orderCreateDto.getTransportFee()));
+        }else{
+            orderCreateDto.setTransportFee(NumberTransform.ZERO);
+            orderTransportFeeQuery.setTotleAmount(orderCreateDto.getTotleAmount());
+        }
+        TransportFeeDto transportFee = getTransportFee(orderTransportFeeQuery);
+        if(transportFee != null){
+            if(!transportFee.getTransportFee().equals(orderCreateDto.getTransportFee().multiply(NumberTransform.ONE_HUNDERD).setScale(2,RoundingMode.HALF_UP).longValue())){
+                throw new OrderException(OrderErrorCode.PARAM_ERROR,"运费与设置不一致，请刷新后重试");
+            }
+        }else{
+            throw new OrderException(OrderErrorCode.PARAM_ERROR,"运费与设置不一致，请刷新后重试");
+        }
+
+
+    }
+
     /**
      * 买方效验
      * @param customerId
@@ -1033,6 +1069,68 @@ public class OrderServiceImpl implements OrderService {
     }
     @Override
+    public TransportFeeDto getTransportFee(OrderTransportFeeQuery order) {
+        TransportFeeDto transportFeeDto = new TransportFeeDto();
+        ShopExpressQueryCo shopExpressQueryCo = new ShopExpressQueryCo();
+        shopExpressQueryCo.setShopId(order.getShopId());
+        ShopExpressVo shopExpressVo = shopExpressSettingService.detail(shopExpressQueryCo);
+        if(shopExpressVo == null){
+            throw new OrderException(OrderErrorCode.PARAM_ERROR,"当前商家暂不支持配送");
+        }else{
+            if(CollectionUtils.isEmpty(shopExpressVo.getType())){
+                throw new OrderException(OrderErrorCode.PARAM_ERROR,"当前商家暂不支持配送");
+            }else if(!shopExpressVo.getType().contains(ExpressType.DELIVERY.getCode())){
+                throw new OrderException(OrderErrorCode.PARAM_ERROR,"当前商家暂不支持配送");
+            }
+        }
+        if(shopExpressVo.getFee()!=null){
+            return transportFeeDto;
+        }
+        if(CollectionUtils.isNotEmpty(shopExpressVo.getCondition())){
+            if(shopExpressVo.getCondition().contains(ExpressCondition.MONEY.getCode())){
+                if(order.getTotleAmount().compareTo(shopExpressVo.getFreeAmount())>=0){
+                    return transportFeeDto;
+                }else{
+                    transportFeeDto.setTransportFee(shopExpressVo.getFee().multiply(NumberTransform.ONE_HUNDERD).longValue());
+                }
+            }
+            if(shopExpressVo.getCondition().contains(ExpressCondition.LOGIC.getCode())){
+                if(shopExpressVo.getFreeTime() == null){
+                    return transportFeeDto;
+                }else{
+                    LocalDateTime now = LocalDateTime.now();
+                    LocalDateTime newDateTime = now.toLocalDate().atTime(shopExpressVo.getFreeTime());
+                    OrderTransportFeeQuery orderTransportFeeQuery = new OrderTransportFeeQuery();
+                    if(newDateTime.isBefore(now)){
+                        orderTransportFeeQuery.setStartTime(newDateTime);
+                        orderTransportFeeQuery.setEndTime(newDateTime.plusHours(shopExpressVo.getPeriod()));
+                    }else{
+                        orderTransportFeeQuery.setStartTime(newDateTime.minusHours(shopExpressVo.getPeriod()));
+                        orderTransportFeeQuery.setEndTime(newDateTime);
+                    }
+                    orderTransportFeeQuery.setShopId(shopExpressVo.getShopId());
+
+                    orderTransportFeeQuery.setBuyerId(order.getBuyerId());
+                    orderTransportFeeQuery.setMarketId(order.getMarketId());
+                    orderTransportFeeQuery.setAchieveAddress(order.getAchieveAddress());
+                    Integer number = orderMapper.selectOrderByTransportFee(orderTransportFeeQuery);
+                    if(number!=null &&number>0){
+                        transportFeeDto.setTransportFee(0L);
+                        return transportFeeDto;
+                    }else{
+                        transportFeeDto.setTransportFee(shopExpressVo.getFee().multiply(NumberTransform.ONE_HUNDERD).longValue());
+                        return transportFeeDto;
+                    }
+                }
+            }
+            return transportFeeDto;
+        }else{
+            transportFeeDto.setTransportFee(shopExpressVo.getFee().multiply(NumberTransform.ONE_HUNDERD).longValue());
+            return transportFeeDto;
+        }
+    }
+
+    @Override
     public Integer checkPayStateOnLine(String paymentId, Long marketId) {
         WeChatPayFunctionDto functionDto = new WeChatPayFunctionDto(paymentId,"online",marketId);
         OrderPaymentCheckDto orderPaymentCheckDto = this.wxChatPayCheck(functionDto);
@@ -522,4 +522,18 @@
             parameterType="java.lang.String">
         select verify_state,`state`,achieve_state,order_status,pay_state from `order` where `code` = #{code}
     </select>
+    <select id="selectOrderByTransportFee" resultType="java.lang.Integer"
+            parameterType="com.diligrp.etrade.order.domain.OrderTransportFeeQuery">
+        select count(*) from `order` ord
+        left join order_delivery ode on ord.`code` = ode.order_code
+        <where>
+            ord.buyer_id = #{buyerId}
+            and ord.shop_id = #{shopId}
+            and ord.achieve_type = 2
+            and ord.pay_state = 3
+            and ode.address = #{achieveAddress}
+            and ord.paytime >= #{startTime}
+            and #{endTime} > ord.paytime
+        </where>
+    </select>
 </mapper>
 \ No newline at end of file