商品管理模块实现

client-app/src/main/java/com/sapit/client/app/third/controller/goods/ThirdStoreGoodsManageCtltest.java

@@ -33,6 +33,17 @@ public class ThirdStoreGoodsManageCtltest {
         return thirdStoreGoodsManageCtltestService.selectByStoreId(storeId);
     }
 
+    /**
+     * 获取店铺商品类型列表（前端兼容）
+     * @param storeId
+     * @return
+     */
+    @PostMapping("/getTypeList")
+    @AuthToken(type = "third")
+    public ResultBean getTypeList(Long storeId) {
+        return thirdStoreGoodsManageCtltestService.selectByStoreId(storeId);
+    }
+
     /**
      * 修改店铺商品类型
      * @param type

client-app/src/main/java/com/sapit/client/app/third/controller/goods/ThirdStoreGoodsManageCtltestService.java

@@ -946,7 +946,7 @@ public class ThirdStoreGoodsManageCtltestService extends BaseDao {
         sql.append("SELECT t.GOODS_TYPE_ID, t.GOODS_TYPE_NAME, count(w.GOODS_ID), t.TYPE FROM bu_goods_type t ")
                 .append("LEFT JOIN bu_goods w on t.GOODS_TYPE_ID = w.GOODS_TYPE_ID ")
                 .append("WHERE t.STORE_ID = ").append(storeId)
-                .append(" AND w.DEL_FLAG = 0 GROUP BY t.GOODS_TYPE_ID ORDER BY t.ORDER_KEY DESC");
+                .append(" AND (w.DEL_FLAG = 0 OR w.DEL_FLAG IS NULL) GROUP BY t.GOODS_TYPE_ID ORDER BY t.ORDER_KEY DESC");
         List<Object> list = searchBySql(sql.toString());
 
         List<GoodsTypeBean> result = new ArrayList<>();