|
@@ -8,7 +8,11 @@ import java.util.Date;
|
|
|
import java.util.List;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.pj.enummj.AuditStatus;
|
|
|
+import com.pj.enummj.DeleteStatus;
|
|
|
+import com.pj.enummj.GoodsStatus;
|
|
|
import com.pj.tb_enterprise.TbEnterprise;
|
|
|
+import com.pj.tb_goods.TbGoods;
|
|
|
import com.pj.tb_goods_transit.param.JudgeTransitParam;
|
|
|
import com.pj.utils.so.SoMap;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -69,9 +73,9 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
|
|
|
/** 查看一级市场在销商品 */
|
|
|
List<TbGoodsTransit> getTransitList(SoMap so){
|
|
|
//设置可展示的状态
|
|
|
- so.set("audit_status",1);
|
|
|
- so.set("delete_status",1);
|
|
|
- so.set("goods_status",1);
|
|
|
+ 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());
|
|
|
//获取在销商品列表,根据日期进行降序排序
|
|
|
List<TbGoodsTransit> goodsTransitList = tbGoodsTransitMapper.getList(so);
|
|
|
return goodsTransitList;
|
|
@@ -106,6 +110,14 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
|
|
|
return "已完成 " + count + "条 数据审核!";
|
|
|
}
|
|
|
|
|
|
+ /** 查看一级市场上架的商品 */
|
|
|
+ public List<TbGoods> getSelfGoodsTransit(Integer goodsType){
|
|
|
+ //默认查询已上架的商品
|
|
|
+ LambdaQueryWrapper<TbGoods> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 导入
|
|
|
* @param file excel文件
|