7.31 枚举

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

@@ -12,7 +12,7 @@ import lombok.Getter;
 public enum DeleteStatus {
 
     DELETE_STATUS_ON(1,"启用"),
-    DELETE_STATUS_OFF(2,"禁用");
+    DELETE_STATUS_OFF(0,"禁用");
 
     private Integer code;
 

sp-core/sp-base/src/main/java/com/pj/enummj/People.java

@@ -13,7 +13,7 @@ public enum People {
 
     PEOPLE_TYPE_ONE(1,"边民类型"),
     PEOPLE_TYPE_TWO(2,"商户类型"),
-    PEOPLE_TYPE_Three(3,"收购商类型");
+    PEOPLE_TYPE_THREE(3,"收购商类型");
 
 
 

sp-service/level-one-server/src/main/java/com/pj/tb_enterprise/TbEnterpriseService.java

@@ -164,7 +164,7 @@ public class TbEnterpriseService extends ServiceImpl<TbEnterpriseMapper, TbEnter
 
 		//获取当前登录用户
 		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
-		if(appLoginInfo.getLoginId() == null)throw new RuntimeException("当前登陆用户信息已失效!");
+		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)throw new RuntimeException("当前登陆用户信息已失效!");
 		Long loginId = appLoginInfo.getLoginId();
 		//仅能查询自己的订单
 		so.set("buy_user_id",loginId);

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

@@ -250,8 +250,8 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		TbOrder tbOrder = methodGoodsTransitService.setTbOrderProperties(tbGoodsTransit, appLoginInfo);
 
 //		//查询是否已存在该订单
-//		List<TbOrder> tbOrderList = tbOrderMapper.selectList(new LambdaQueryWrapper<TbOrder>().eq(TbOrder::getGoodsId, tbGoodsTransit.getId()));
-//		if(tbOrderList.size() != 0)throw new RuntimeException("当前商品已存在订单,暂时无法继续下单!");
+		List<TbOrder> tbOrderList = tbOrderMapper.selectList(new LambdaQueryWrapper<TbOrder>().eq(TbOrder::getGoodsId, tbGoodsTransit.getId()).eq(TbOrder::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode()));
+		if(tbOrderList.size() != 0)throw new RuntimeException("当前商品已存在订单,暂时无法继续下单!");
 
 		//执行保存 创建订单
 		int insert = tbOrderMapper.insert(tbOrder);

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

@@ -22,6 +22,7 @@ public class SmsRetryService {
     @Retryable(value = Exception.class,maxAttempts = 3,backoff = @Backoff(delay = 2000,multiplier = 1.5))
     public boolean sendSms(String phone,String code) throws Exception {
         //模拟发送失败
+        //todo: 发送短信业务逻辑
         throw new Exception("模拟短信发送失败!");
     }
 

sp-service/level-one-server/src/main/java/com/pj/tb_order_after_sale/TbOrderAfterSaleService.java

@@ -68,7 +68,7 @@ public class TbOrderAfterSaleService extends ServiceImpl<TbOrderAfterSaleMapper,
 		return tbOrderList;
 	}
 
-	/** 售后申请 */
+	/** 边民发起售后申请 */
 	boolean afterSale(AfterSaleParam afterSaleParam){
 		TbOrderAfterSale tbOrderAfterSale = new TbOrderAfterSale();
 		BeanUtils.copyProperties(afterSaleParam,tbOrderAfterSale);