mac преди 1 година
родител
ревизия
b3ee01aa70

+ 2 - 0
kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/CommonConstants.java

@@ -110,4 +110,6 @@ public interface CommonConstants {
 	String BIND_PUSH_NAME = "BindNotify";
     String RESULT_SUC = "订购成功";
 
+    String DEFAULT_IF_CODE = "TY";
+
 }

+ 9 - 1
lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/service/impl/LhbGoodsServiceImpl.java

@@ -161,9 +161,17 @@ public class LhbGoodsServiceImpl extends MPJBaseServiceImpl<LhbGoodsMapper, LhbG
 
         List<LhbGoods> list = list(Wrappers.lambdaQuery(LhbGoods.class).eq(LhbGoods::getStatus, CommonConstants.SUCCESS));
 
+        List<PackagesRes> packages = channelFactory.getChannel(CommonConstants.DEFAULT_IF_CODE).getPackages(PackagesReq.builder().build());
+
         list.forEach(goods -> {
+            Optional<PackagesRes> first = packages.stream().filter(item -> goods.getExternalId().equals(item.getId())).findFirst();
 
-            Boolean aBoolean = updateGoods(goods);
+            if (first.isEmpty()) {
+                goods.setStatus(CommonConstants.FAIL);
+                goods.updateById();
+            }else{
+                refreshGoods(goods, first.get());
+            }
 
         });
     }

+ 4 - 4
lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/service/impl/LhbOrderServiceImpl.java

@@ -46,10 +46,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -115,6 +112,9 @@ public class LhbOrderServiceImpl extends MPJBaseServiceImpl<LhbOrderMapper, LhbO
         LhbUser user = userService.getById(SecurityUtils.getUser().getId());
 
         LhbGoods goods = goodsService.getById(order.getGoodsId());
+        if(goods == null || Objects.equals(goods.getStatus(), CommonConstants.FAIL)){
+            throw new GlobalCustomerException("该商品已下架");
+        }
 
         String ageSection = goods.getAgeSection();
         String[] split = ageSection.split(StrUtil.DASHED);