fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -792,7 +792,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                 throw new CustomException("过期商品不允许上架");
             }
         }
-        if ((entity.getStatus() == -1 || entity.getStatus() == 0) && entity.getGoodsId().longValue() > 0) {
+        if ((entity.getStatus() == -1 || entity.getStatus() == 0) && entity.getGoodsId().longValue() > 0 &&entity.getGoodsType()!=7) {
             List<Long> payStatus = new ArrayList<>();
             payStatus.add(2L);
             payStatus.add(3L);

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsCategoryVo.java

@@ -43,9 +43,9 @@ private static final long serialVersionUID=1L;
     private Long storeId;
     @ApiModelProperty("商户ID")
     private Long merId;
-    @ApiModelProperty("店铺ID")
+    @ApiModelProperty("店铺名称")
     private String storeName;
-    @ApiModelProperty("商户ID")
+    @ApiModelProperty("商户名称")
     private String merName;
 
     @ApiModelProperty("子类目")

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -385,4 +385,8 @@ public class GoodsVo {
 	@Excel(name = "关联使用类型 1积分商城 2会员卡")
 	@ApiModelProperty("关联使用类型 1积分商城 2会员卡,多个,拼接")
 	private String useType;
+	@ApiModelProperty("商户名称")
+	private String merName;
+	@ApiModelProperty("店铺名称")
+	private String storeName;
 }

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -936,9 +936,14 @@
     </select>
 
     <select id="queryPointsList" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo"
-            resultMap="GoodsResultVo">
+            resultType="com.zhongzheng.modules.goods.vo.GoodsVo">
         SELECT
-        g.*
+        g.*,
+        tm.mer_name,
+        ts.store_name
+        from goods g
+        LEFT JOIN top_merchant tm ON g.mer_id = tm.mer_id
+        LEFT JOIN top_store ts ON g.store_id = ts.store_id
         WHERE
         1 = 1
         AND g.goods_type = 7