FengChaoYu il y a 9 mois
Parent
commit
26b8e4a927

+ 11 - 4
mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitSalesLogic.java

@@ -76,6 +76,7 @@ public class WebsitSalesLogic {
     private final AllInPayLogic allInPayLogic;
     private final AdminWebsitPayConfigService adminWebsitPayConfigService;
     private final WorkerGoodsRelaService workerGoodsRelaService;
+    private final WorkerGoodsService workerGoodsService;
     private final MaterialConfigService materialConfigService;
 
     public IPage<WebsitSalesVO> page(WebsitSalesParamBean zfireParamBean) {
@@ -289,8 +290,11 @@ public class WebsitSalesLogic {
                         .eq(WorkerGoodsRela::getWebsitGoodsId, goods.getGoodsId())
                         .one();
                 if (Objects.nonNull(goodsRela)) {
-                    item.setWorkerGoodsId(goodsRela.getWorkerGoodsId())
-                            .setWorkerGoodsName(goodsRela.getWorkerGoodsName());
+                    final WorkerGoods workerGoods = workerGoodsService.getById(goodsRela.getWorkerGoodsId());
+                    if (workerGoods.getStatus().equals(StateEnum.ON.getKey())) {
+                        item.setWorkerGoodsId(goodsRela.getWorkerGoodsId())
+                                .setWorkerGoodsName(goodsRela.getWorkerGoodsName());
+                    }
                 }
             }
 
@@ -908,8 +912,11 @@ public class WebsitSalesLogic {
                                     .eq(WorkerGoodsRela::getWebsitGoodsId, bean.getGoods().getGoodsId())
                                     .one();
                             if (Objects.nonNull(goodsRela)) {
-                                salesItemBean.setWorkerGoodsId(goodsRela.getWorkerGoodsId());
-                                salesItemBean.setWorkerGoodsName(goodsRela.getWorkerGoodsName());
+                                final WorkerGoods workerGoods = workerGoodsService.getById(goodsRela.getWorkerGoodsId());
+                                if (workerGoods.getStatus().equals(StateEnum.ON.getKey())) {
+                                    salesItemBean.setWorkerGoodsId(goodsRela.getWorkerGoodsId());
+                                    salesItemBean.setWorkerGoodsName(goodsRela.getWorkerGoodsName());
+                                }
                             }
                         }