Browse Source

no message

FengChaoYu 10 months ago
parent
commit
c4c0dcad49

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

@@ -456,9 +456,11 @@ public class WebsitSalesLogic {
             detail.setConvertQty(bean.getConvertQty());
             detail.setConvertPrice(bean.getConvertPrice());
 
-            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);
+            if (bean.getGoodsType().equals(WebsitGoodsTypeEnum.M.toString())) {
+                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());
 

+ 1 - 1
mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -103,7 +103,7 @@
             </foreach>
         </if>
         and a.apply_type='WORKER'
-
+        AND a.worker_number IS NOT NULL
         ORDER BY FIELD(b.examine_status,'WAIT','OK','FAIL'),a.create_time DESC
     </select>