Mechrevo 1 год назад
Родитель
Сommit
3297682a02

+ 24 - 0
sp-core/sp-base/src/main/java/com/pj/enummj/AuditStatus.java

@@ -0,0 +1,24 @@
+package com.pj.enummj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 07 26 10 11
+ **/
+@Getter
+@AllArgsConstructor
+public enum AuditStatus {
+
+    AUDIT_STATUS_ON(1,"审核通过"),
+    AUDIT_STATUS_WAIT(2,"审核不通过"),
+    AUDIT_STATUS_OFF(0,"待审核");
+
+    private Integer code;
+
+    private String msg;
+
+
+
+}

+ 23 - 0
sp-core/sp-base/src/main/java/com/pj/enummj/DeleteStatus.java

@@ -0,0 +1,23 @@
+package com.pj.enummj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 07 26 10 10
+ **/
+@Getter
+@AllArgsConstructor
+public enum DeleteStatus {
+
+    DELETE_STATUS_ON(1,"启用"),
+    DELETE_STATUS_OFF(2,"禁用");
+
+    private Integer code;
+
+    private String msg;
+
+
+
+}

+ 23 - 0
sp-core/sp-base/src/main/java/com/pj/enummj/GoodsStatus.java

@@ -0,0 +1,23 @@
+package com.pj.enummj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 07 26 10 09
+ **/
+@Getter
+@AllArgsConstructor
+public enum GoodsStatus {
+
+
+    GOODS_STATUS_ON(1,"在售"),
+    GOODS_STATUS_OFF(2,"下架");
+
+    private Integer code;
+
+    private String msg;
+
+
+}

+ 0 - 1
sp-service/level-one-server/src/main/java/com/pj/tb_goods/TbGoodsService.java

@@ -64,7 +64,6 @@ public class TbGoodsService extends ServiceImpl<TbGoodsMapper, TbGoods> implemen
 		return tbGoodsMapper.getList(so);	
 	}
 
-
 	/**
 	 * 导入
 	 * @param file excel文件

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

@@ -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文件

+ 3 - 1
sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java

@@ -40,6 +40,8 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 	//权限字符
 	@Autowired
 	private ReRoleMenuMapper reRoleMenuMapper;
+	/** 验证码前缀 */
+	String PREFIX = "app_user:phone:sms_code:";
 
 
 
@@ -233,7 +235,7 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		// return false;
 
 		//todo: 保存到缓存,默认1分钟
-		RedisUtil.setByMINUTES(phone,smsCode, 1);
+		RedisUtil.setByMINUTES(PREFIX + phone,smsCode, 1);
 
 		return true;
 	}