Переглянути джерело

1.修改编译失败代码
2.去除多余校验

donglang 2 місяців тому
батько
коміт
e0524abd6f

+ 4 - 4
sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/TradeOrderManageService.java

@@ -240,12 +240,12 @@ public class TradeOrderManageService {
         //查询贸易合同商品信息
         Map<Long, KwoTradeOrderGoods> tradeOrderIdGoodsMap = Maps.newHashMap() ;
         List<KwoTradeOrderGoods> tradeOrderGoods = tradeOrderGoodsRepository.queryByOrderIds(tradeOrderIds);
-        List<Long> goodsIds = Lists.newArrayList();
+        List<Long> goodsIdList = Lists.newArrayList();
         if (CollectionUtils.isNotEmpty(tradeOrderGoods)){
             tradeOrderIdGoodsMap = tradeOrderGoods.stream()
                     .collect(Collectors.toMap(KwoTradeOrderGoods::getTOrderId, Function.identity(), (k, v) -> k));
             //获取商品id
-            goodsIds = tradeOrderGoods.stream()
+            goodsIdList = tradeOrderGoods.stream()
                     .map(KwoTradeOrderGoods::getGoodsId)
                     .distinct()
                     .collect(Collectors.toList());
@@ -253,8 +253,8 @@ public class TradeOrderManageService {
 
         //查询商品信息
         Map<Long, KwpGoods> goodsIdAndGoodsMap = Maps.newHashMap() ;
-        if (CollectionUtils.isNotEmpty(goodsIds)){
-           goodsIdAndGoodsMap = goodsInfoService.getGoodsByIds(goodsIds);
+        if (CollectionUtils.isNotEmpty(goodsIdList)){
+           goodsIdAndGoodsMap = goodsInfoService.getGoodsByIds(goodsIdList);
         }
 
         //查询贸易订单公司信息

+ 0 - 1
sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddGoodsParam.java

@@ -82,7 +82,6 @@ public class AddGoodsParam {
      * 参考价格(元)
      */
     @Schema(description = "参考价格(元)")
-    @NotNull(message = "参考价格(元)")
     @DecimalMin(value = "0.01", message = "参考价格必须大于零")
     private BigDecimal price;