no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/WebsitSalesLogic.java

@@ -15,6 +15,7 @@ import com.gree.mall.miniapp.enums.IsYesNoEnum;
 import com.gree.mall.miniapp.enums.OrderInfoSourceEnum;
 import com.gree.mall.miniapp.enums.PayOrderTypeEnum;
 import com.gree.mall.miniapp.enums.PayTypeEnum;
+import com.gree.mall.miniapp.enums.es.ESGoodsStatusEnum;
 import com.gree.mall.miniapp.enums.material.WebsitGoodsTypeEnum;
 import com.gree.mall.miniapp.exception.RemoteServiceException;
 import com.gree.mall.miniapp.helper.ResponseHelper;
@@ -77,6 +78,8 @@ public class WebsitSalesLogic {
     MaterialConfigService materialConfigService;
     @Resource
     WorkerGoodsRelaService workerGoodsRelaService;
+    @Resource
+    WorkerGoodsService workerGoodsService;
 
     public IPage<SalesOrderBean> buyList(String flag, Integer pageNum, Integer pageSize, HttpServletRequest request) {
         CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat(request);
@@ -452,8 +455,11 @@ public class WebsitSalesLogic {
             detail.setManageWorkerStock(bean.getManageWorkerStock());
             detail.setConvertQty(bean.getConvertQty());
             detail.setConvertPrice(bean.getConvertPrice());
-            detail.setWorkerGoodsId(bean.getWorkerGoodsId());
-            detail.setWorkerGoodsName(bean.getWorkerGoodsName());
+
+            final WorkerGoods workerGoods = workerGoodsService.getById(bean.getWorkerGoodsId());
+            detail.setWorkerGoodsId(workerGoods.getStatus().equals(ESGoodsStatusEnum.ON.getKey()) ? bean.getWorkerGoodsId() : null);
+            detail.setWorkerGoodsName(workerGoods.getStatus().equals(ESGoodsStatusEnum.ON.getKey()) ? bean.getWorkerGoodsName() : null);
+
             detail.setOrigPartsPrice(bean.getOrigPartsPrice());
 
             orderDetails.add(detail);