Merge branch 'dev' of http://git.sckaiwu.cn/17358629955/sckw-service-platform into dev

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/dubbo/RemoteManageServiceImpl.java

@@ -44,7 +44,7 @@ public class RemoteManageServiceImpl implements RemoteManageService {
             return map;
         }
 
-        List<EntAddressResDto> entAddressResDtoList= BeanUtils.copyToList(kwmAddressList, EntAddressResDto.class);
+        List<EntAddressResDto> entAddressResDtoList = BeanUtils.copyToList(kwmAddressList, EntAddressResDto.class);
         return entAddressResDtoList.stream().collect(Collectors.groupingBy(EntAddressResDto::getEntId));
     }
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/res/AddressQueryResVo.java

@@ -97,12 +97,12 @@ public class AddressQueryResVo implements Serializable {
     /**
      * 地址类型
      */
-    private String type;
+    private String typeName;
 
     /**
      * 地址类型
      */
-    private Integer typeCode;
+    private Integer type;
 
     /**
      * 修改时间

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -124,18 +124,18 @@ public class KwmAddressService {
         kwmAddresses.forEach(item -> {
             AddressQueryResVo addressQueryResVo = new AddressQueryResVo();
             BeanUtils.copyProperties(item, addressQueryResVo);
-            addressQueryResVo.setTypeCode(item.getType());
+            addressQueryResVo.setType(item.getType());
             UserCacheResDto userCacheResDto = userCacheResDtoMap.get(item.getCreateBy());
             SysDictResDto sysDictResDto = stringSysDictResDtoMap.get(DictTypeEnum.ADDRESS_TYPE.getType() + Global.POUND + item.getType());
             if (Objects.nonNull(sysDictResDto)) {
-                addressQueryResVo.setType(sysDictResDto.getLabel());
+                addressQueryResVo.setTypeName(sysDictResDto.getLabel());
             }
 
             if (Objects.nonNull(userCacheResDto)) {
                 addressQueryResVo.setCreateByName(userCacheResDto.getName());
             }
             if (Objects.nonNull(sysDictResDto)) {
-                addressQueryResVo.setType(sysDictResDto.getLabel());
+                addressQueryResVo.setTypeName(sysDictResDto.getLabel());
             }
 
             if (Objects.nonNull(item.getDefaultType())) {

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -100,9 +100,7 @@ public class KwoTradeOrderService {
      * @desc: 添加其他订单信息
      * @author: yzc
      * @date: 2023-07-13 8:53
-     * @Param id:
-     * @Param tOrderNo:
-     * @Param status:
+     * @Param tradeOrder:
      * @Param param:
      * @Param isUpdate:
      * @return: void
@@ -118,7 +116,7 @@ public class KwoTradeOrderService {
         kwoTradeOrderGoodsService.delByOrderId(id);
         GoodsInfo goodsInfo = param.getGoodsInfo();
         KwoTradeOrderGoods goods = BeanUtils.copyProperties(goodsInfo, KwoTradeOrderGoods.class);
-        if (Objects.nonNull(goods)) {
+        if (Objects.nonNull(goods) && Objects.nonNull(goods.getGoodsId())) {
             GoodsDetail goodsDetail = goodsInfoService.getDetailById(goods.getGoodsId());
             if (Objects.isNull(goodsDetail) || !Objects.equals(goodsDetail.getStatus(), 1)
                     || Objects.equals(goodsDetail.getDelFlag(), Global.YES)) {

sckw-modules/sckw-product/src/main/java/com/sckw/product/controller/KwpGoodsController.java

@@ -67,7 +67,7 @@ public class KwpGoodsController {
     @GetMapping("/detail")
     @Log(description = "获取商品详情")
     public HttpResult detail(@RequestParam Long id) {
-        return HttpResult.ok(kwpGoodsService.detail(id, false));
+        return HttpResult.ok(kwpGoodsService.detail(id));
     }
 
     /**

sckw-modules/sckw-product/src/main/java/com/sckw/product/dubbo/GoodsInfoServiceImpl.java

@@ -34,7 +34,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
 
     @Override
     public GoodsDetail getDetailById(Long id) {
-        return BeanUtils.copyProperties(kwpGoodsService.detail(id, true), GoodsDetail.class);
+        return BeanUtils.copyProperties(kwpGoodsService.detail(id), GoodsDetail.class);
     }
 
     @Override

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -168,18 +168,10 @@ public class KwpGoodsService {
      * @Param id:
      * @return: com.sckw.product.model.vo.res.GoodsDetail
      */
-    public GoodsDetail detail(Long id, Boolean isDubbo) {
-        KwpGoods goods;
-        if (isDubbo) {
-            goods = kwpGoodsMapper.selectById(id);
-            if (Objects.isNull(goods)) {
-                return null;
-            }
-        } else {
-            goods = getGoodsById(id);
-            if (Objects.isNull(goods)) {
-                throw new BusinessException("当前商品信息为空！");
-            }
+    public GoodsDetail detail(Long id) {
+        KwpGoods goods = kwpGoodsMapper.selectById(id);
+        if (Objects.isNull(goods)) {
+            throw new BusinessException("当前商品不存在！");
         }
         GoodsDetail detail = BeanUtils.copyProperties(goods, GoodsDetail.class);
         List<EntCacheResDto> entCacheList = remoteSystemService.queryEntCacheByIds(Arrays.asList(detail.getEntId(), detail.getSupplyEntId()));