Merge branch 'dev' of http://git.aseanbusiness.cn/qzyReal/market-server into dev

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransitController.java

@@ -3,6 +3,7 @@ package com.pj.tb_goods_transit;
 import java.io.IOException;
 import java.util.List;
 
+import com.pj.enummj.DeleteStatus;
 import com.pj.tb_goods_transit.param.JudgeTransitParam;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -110,6 +111,7 @@ public class TbGoodsTransitController {
 	@GetMapping("getTransitList")
 	public AjaxJson getTransitList(@RequestParam(value = "goodsType",required = false)String goodsType){
 		SoMap so = SoMap.getRequestSoMap();
+		so.put("deleteStatus" , DeleteStatus.DELETE_STATUS_ON.getCode());
 		List<TbGoodsTransit> transitList = tbGoodsTransitService.getTransitList(so.startPage(),goodsType);
 		return AjaxJson.getPageData(so.getDataCount(),transitList);
 	}

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransitService.java

@@ -106,11 +106,8 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 	/** 查看一级市场在销/上架商品 */
 	List<TbGoodsTransit> getTransitList(SoMap so,String goodsType){
 		//设置可展示的状态
-		so.set("audit_status", AuditStatus.AUDIT_STATUS_ON.getCode());
-		so.set("delete_status", DeleteStatus.DELETE_STATUS_ON.getCode());
-		so.set("goods_status", GoodsStatus.GOODS_STATUS_ON.getCode());
 		if(goodsType != null){
-			so.set("goods_type", goodsType);
+			so.set("goodsType", goodsType);
 		}
 		//获取在销商品列表,根据日期进行降序排序
 		List<TbGoodsTransit> goodsTransitList = tbGoodsTransitMapper.getList(so);