update:运费配置，购物车商品异常显示

fengliang
1 parent 0a1ce7c8
Showing 10 changed files with 370 additions and 6 deletions
etrade-core/src/main/java/com/diligrp/etrade/core/util/MoneyUtil.java
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderController.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/ShopCartMessageVo.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/TransportFeeDto.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/ShopCartImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/type/ShopCartMessageProductState.java
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/basicdata/BasicDataConfigRpc.java
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/dto/request/ConfigQueryDto.java
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/dto/response/ConfigDto.java
@@ -108,7 +108,7 @@ public class MoneyUtil {
      */
     public static Long getAmountByWeight(Long unitAmount, Long weight) {
         if (unitAmount != null && weight != null) {
-            return Math.round(unitAmount * weight / 500.0);
+            return Math.round(unitAmount * weight / 100.0);
         }
         return 0L;
     }
@@ -15,8 +15,12 @@ import com.diligrp.etrade.order.type.OrderOrderType;
 import com.diligrp.etrade.order.type.OrderState;
 import com.diligrp.etrade.order.util.OrderConstant;
 import com.diligrp.etrade.order.util.ParameterDetection;
+import com.diligrp.etrade.rpc.basicdata.BasicDataConfigRpc;
 import com.diligrp.etrade.rpc.dto.WeChatPayFunctionDto;
 import com.diligrp.etrade.rpc.dto.WeChatPayTradeCallBackDto;
+import com.diligrp.etrade.rpc.dto.request.ConfigQueryDto;
+import com.diligrp.etrade.rpc.dto.response.BaseOutput;
+import com.diligrp.etrade.rpc.dto.response.ConfigDto;
 import com.diligrp.etrade.shared.domain.OrderQrCode;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import jakarta.annotation.Resource;
@@ -53,6 +57,9 @@ public class OrderController {
     @Resource
     private RedissonClient redissonClient;
  
+    @Resource
+    private BasicDataConfigRpc basicDataConfigRpc;
+
     /**
      * 买家创建订单
      * @return
@@ -774,4 +781,38 @@ public class OrderController {
         }
     }
  
+    /**
+     * 获取市场运费
+     * @param order
+     * @return
+     */
+    @RequestMapping(value = "/getTransportFee",method = {RequestMethod.POST},produces="application/json;charset=UTF-8")
+    public Message<TransportFeeDto> getTransportFee(@RequestBody OrderDto order){
+        try{
+            if(order.getMarketId()==null){
+                return Message.failure(OrderErrorCode.PARAM_ERROR,"市场不能为空");
+            }
+            ConfigQueryDto query = new ConfigQueryDto();
+            query.setName("甄选运费");
+            query.setMarketId(order.getMarketId());
+            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);
+                }
+            }
+            return Message.success(new TransportFeeDto());
+        }catch (PlatformServiceException pe) {
+            LOGGER.warn("服务异常{}:{}",pe.getCode(), pe.getMessage());
+            return Message.failure("服务暂时不在线，请稍后");
+        }
+    }
+
+
+
 }
@@ -158,11 +158,20 @@ public class ShopCartMessageVo implements Serializable {
      * 商品别名
      */
     private String alias;
+    /**
+     * 商品包装单位
+     */
+    private Integer saleUnit;
  
     public String getAlias() {
         return alias;
     }
  
+    /**
+     * 商品状态
+     */
+    private Integer productState;
+
     public void setAlias(String alias) {
         this.alias = alias;
     }
@@ -333,4 +342,20 @@ public class ShopCartMessageVo implements Serializable {
     public void setCreaterId(Long createrId) {
         this.createrId = createrId;
     }
+
+    public Integer getSaleUnit() {
+        return saleUnit;
+    }
+
+    public void setSaleUnit(Integer saleUnit) {
+        this.saleUnit = saleUnit;
+    }
+
+    public Integer getProductState() {
+        return productState;
+    }
+
+    public void setProductState(Integer productState) {
+        this.productState = productState;
+    }
 }
+package com.diligrp.etrade.order.domain;
+
+public class TransportFeeDto {
+    private Long transportFee = 0l;
+
+    public Long getTransportFee() {
+        return transportFee;
+    }
+
+    public void setTransportFee(Long transportFee) {
+        this.transportFee = transportFee;
+    }
+}
@@ -3,10 +3,7 @@ package com.diligrp.etrade.order.service.impl;
 import com.diligrp.etrade.core.domain.Message;
 import com.diligrp.etrade.core.util.JsonUtils;
 import com.diligrp.etrade.order.dao.OrderGoodsMapper;
-import com.diligrp.etrade.order.domain.OrderCreateDto;
-import com.diligrp.etrade.order.domain.ProductCheckDto;
-import com.diligrp.etrade.order.domain.ProductDto;
-import com.diligrp.etrade.order.domain.ProductExtDto;
+import com.diligrp.etrade.order.domain.*;
 import com.diligrp.etrade.order.exception.OrderErrorCode;
 import com.diligrp.etrade.order.exception.OrderException;
 import com.diligrp.etrade.order.model.Order;
@@ -16,6 +13,10 @@ import com.diligrp.etrade.order.type.*;
 import com.diligrp.etrade.order.util.GenericRpcResolver;
 import com.diligrp.etrade.order.util.NumberTransform;
 import com.diligrp.etrade.rpc.CustomerRpc;
+import com.diligrp.etrade.rpc.basicdata.BasicDataConfigRpc;
+import com.diligrp.etrade.rpc.dto.request.ConfigQueryDto;
+import com.diligrp.etrade.rpc.dto.response.BaseOutput;
+import com.diligrp.etrade.rpc.dto.response.ConfigDto;
 import com.diligrp.etrade.rpc.dto.response.CustomerMarket;
 import com.diligrp.etrade.rpc.type.CustomerState;
 import com.diligrp.etrade.shop.domain.request.ShopCo;
@@ -59,6 +60,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
  
     @Resource
     private CustomerRpc customerRpc;
+    @Resource
+    private BasicDataConfigRpc basicDataConfigRpc;
  
     @Override
     public List<OrderGoods> buildOrderGoods(Order order, List<ProductDto> productDtoList) {
@@ -185,8 +188,24 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 waitCouponAmount = waitCouponAmount.subtract(couponAmount);
             }
         }
-        //TODO 配送情况增加计算运费
+        //配送情况增加计算运费
         if(buyerOrderDto.getAchieveType().equals(OrderAchieveType.SELLER_DELIVERY.getCodeInteger())){
+            ConfigQueryDto query = new ConfigQueryDto();
+            query.setName("甄选运费");
+            query.setMarketId(buyerOrderDto.getMarketId());
+            BaseOutput<List<ConfigDto>> listBaseOutput = basicDataConfigRpc.queryAll(query);
+            Long transportFee = buyerOrderDto.getTransportFee().longValue()*100;
+            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.add(buyerOrderDto.getTransportFee());
         }
         //效验库存
@@ -15,6 +15,7 @@ import com.diligrp.etrade.order.model.ShopCartMessage;
 import com.diligrp.etrade.order.service.IShopCartMessageService;
 import com.diligrp.etrade.order.service.IShopCartService;
 import com.diligrp.etrade.order.type.ProductTradeType;
+import com.diligrp.etrade.order.type.ShopCartMessageProductState;
 import com.diligrp.etrade.shop.domain.response.ProductListVo;
 import com.diligrp.etrade.shop.domain.response.ProductPresetVo;
 import com.diligrp.etrade.shop.domain.response.ShopVo;
@@ -130,6 +131,13 @@ public class ShopCartImpl implements IShopCartService {
                         ProductPresetVo productPresetVo = map.get(SaleUnitType.PIECE.getCode());
 //                    AssertUtils.notNull(productPresetVo,
 //                            "未找到商品按件卖的预售价格,productId:"+shopCartMessageVo.getProductId()+"SaleUnitType:"+SaleUnitType.PIECE.getCode());
+                        if(productPresetVo == null){
+                            shopCartMessageVo.setPrePrice(0L);
+                            shopCartMessageVo.setPieceWeight(0L);
+                            shopCartMessageVo.setProductState(ShopCartMessageProductState.TYPE_CHANGE.getCodeInteger());
+                        }
+                        //商品包装单位
+                        shopCartMessageVo.setSaleUnit(productPresetVo.getSaleUnit());
                         //预设价格分
                         shopCartMessageVo.setPrePrice(productPresetVo.getPrePrice() == null ? 0L : productPresetVo.getPrePrice());
                         //预设件重克
@@ -140,6 +148,13 @@ public class ShopCartImpl implements IShopCartService {
 //                    AssertUtils.notNull(productPresetVo,
 //                            "未找到商品按斤卖的预售价格,productId:"+shopCartMessageVo.getProductId()+"SaleUnitType:"+SaleUnitType.CATTY.getCode());
                         //预设价格分
+                        if(productPresetVo == null){
+                            shopCartMessageVo.setPrePrice(0L);
+                            shopCartMessageVo.setProductState(ShopCartMessageProductState.TYPE_CHANGE.getCodeInteger());
+                        }
+                        //商品包装单位
+                        shopCartMessageVo.setSaleUnit(productPresetVo.getSaleUnit());
+
                         shopCartMessageVo.setPrePrice(productPresetVo.getPrePrice() == null ? 0L : productPresetVo.getPrePrice());
                     }
                 }
+package com.diligrp.etrade.order.type;
+
+import com.diligrp.etrade.core.type.IEnumType;
+
+public enum ShopCartMessageProductState implements IEnumType {
+    NORMAL("正常", 1),
+    UNIT_CHANGE("单位变更", 2),
+    TYPE_CHANGE("类型变更", 3),
+    NONE("商品不存在", 4);
+
+    private String name;
+    private Integer code;
+
+    private ShopCartMessageProductState(String name, Integer code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static ShopCartMessageProductState getByCode(Integer code) {
+        for (ShopCartMessageProductState temp : ShopCartMessageProductState.values()) {
+            if (temp.getCodeInteger().equals(code)) {
+                return temp;
+            }
+        }
+        return null;
+    }
+
+    public static String getNameByCode(Integer code) {
+        for (ShopCartMessageProductState temp : ShopCartMessageProductState.values()) {
+            if (temp.getCodeInteger().equals(code)) {
+                return temp.getName();
+            }
+        }
+        return null;
+    }
+
+    public Integer getCodeInteger() {
+        return this.code;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public int getCode() {
+        return this.code;
+    }
+
+    public String toString() {
+        return this.name;
+    }
+}
 \ No newline at end of file
+package com.diligrp.etrade.rpc.basicdata;
+
+import com.diligrp.etrade.core.authority.SessionContext;
+import com.diligrp.etrade.core.domain.Message;
+import com.diligrp.etrade.rpc.dto.request.ConfigQueryDto;
+import com.diligrp.etrade.rpc.dto.request.CusCategoryQuery;
+import com.diligrp.etrade.rpc.dto.response.BaseOutput;
+import com.diligrp.etrade.rpc.dto.response.ConfigDto;
+import com.diligrp.etrade.rpc.dto.response.CusCategoryDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author dengwei
+ * @version 1.0.0
+ * @ClassName CategoryRpc.java
+ * @Description 品类RPC
+ * @date 2023-08-29 17:34
+ */
+@FeignClient(name = "assets-service",
+        contextId = "bdconfig",
+        url = "${AssetsRpc.url:}")
+public interface BasicDataConfigRpc {
+
+    /**
+     * 获取基础数据配置信息
+     */
+    @PostMapping({"/api/config/queryAll"})
+    BaseOutput<List<ConfigDto>> queryAll(ConfigQueryDto query);
+}
+package com.diligrp.etrade.rpc.dto.request;
+
+import java.util.List;
+
+public class ConfigQueryDto {
+    private Long marketId;
+    private String name;
+    private String type;
+    private Integer state;
+    private List<Long> marketIds;
+    private String keyword;
+    private String value;
+
+    public Long getMarketId() {
+        return marketId;
+    }
+
+    public void setMarketId(Long marketId) {
+        this.marketId = marketId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public List<Long> getMarketIds() {
+        return marketIds;
+    }
+
+    public void setMarketIds(List<Long> marketIds) {
+        this.marketIds = marketIds;
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}
+package com.diligrp.etrade.rpc.dto.response;
+
+import java.util.Set;
+
+public class ConfigDto {
+    private Long id;
+    private String name;
+    private Integer nameSort;
+    private String value;
+    private String notes;
+    private Integer notesSort;
+    private Integer state;
+    private Long marketId;
+    private Set<Long> marketIds;
+    private String type;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getNameSort() {
+        return nameSort;
+    }
+
+    public void setNameSort(Integer nameSort) {
+        this.nameSort = nameSort;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public Integer getNotesSort() {
+        return notesSort;
+    }
+
+    public void setNotesSort(Integer notesSort) {
+        this.notesSort = notesSort;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Long getMarketId() {
+        return marketId;
+    }
+
+    public void setMarketId(Long marketId) {
+        this.marketId = marketId;
+    }
+
+    public Set<Long> getMarketIds() {
+        return marketIds;
+    }
+
+    public void setMarketIds(Set<Long> marketIds) {
+        this.marketIds = marketIds;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}