8.1 清理mq残留

sp-core/sp-base/src/main/java/com/pj/project4sp/apilog/SpApilogUtil.java

@@ -100,6 +100,7 @@ public class SpApilogUtil {
 			}
 		
         	LogUtil.info("本次请求耗时：" + ((a.getCostTime() + 0.0) / 1000) + "s, 返回：" + a.getResString());
+			a.setCreateTime(new Date());
         	spApilogMapper.saveObj(a);
 		} catch (Exception e) {
 			e.printStackTrace();

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

@@ -1,7 +1,5 @@
 package com.pj;
 
-import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
-import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.ApplicationPidFileWriter;
@@ -38,13 +36,6 @@ public class LevelOneServer {
 		SpCloudUtil.printCurrentServiceInfo();
 	}
 
-	/**
-	 * 消息转换器
-	 * @return
-	 */
-	@Bean
-	public MessageConverter messageConverter(){
-		return new Jackson2JsonMessageConverter();
-	}
+
 
 }

sp-service/level-one-server/src/main/java/com/pj/tb_goods_cart/dto/GoodsCartInfoDto.java

@@ -1,5 +1,7 @@
 package com.pj.tb_goods_cart.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -18,6 +20,7 @@ public class GoodsCartInfoDto {
 
     /** 购买者ID(组长/个人) */
     @NotNull(message = "购买者ID必填")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long buyUserId;
     /** 商家ID */
     @NotNull(message = "商家ID必填")
@@ -35,12 +38,12 @@ public class GoodsCartInfoDto {
     /** 商品ID */
     @NotNull(message = "商品ID必填")
     private Long saleGoodsInfoId;
-    /** 购买者类型(边民/...) */
-    @NotNull(message = "购买者ID必填")
-    private Integer buyUserType;
-    /** 购买方式 */
-    @NotNull(message = "购买类型(2=互助组,3=个人购买)必填")
-    private Integer buyType;
+//    /** 购买者类型(边民/...) */
+//    @NotNull(message = "购买者ID必填")
+//    private Integer buyUserType;
+//    /** 购买方式 */
+//    @NotNull(message = "购买类型(2=互助组,3=个人购买)必填")
+//    private Integer buyType;
     /** 商品图片 */
     @NotNull(message = "商品ID必填")
     private String goodsImg;

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

@@ -2,6 +2,7 @@ package com.pj.tb_goods_transit.param;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -14,11 +15,13 @@ public class JudgeTransitParam {
     /**
      * 批量审核时的ID集合
      */
+    @NotNull(message = "ids")
     private List<String> ids;
 
     /**
      * 审核状态
      */
+    @NotNull(message = "审核状态不能为空")
     private Integer judgeStatus;
 
     /**

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleController.java

@@ -3,20 +3,16 @@ package com.pj.tb_people;
 import java.io.IOException;
 import java.util.List;
 
-import cn.hutool.extra.cglib.CglibUtil;
 import com.pj.api.dto.PeopleDto;
-import com.pj.tb_group.TbGroup;
 import com.pj.tb_people.dto.StartStopDto;
-import com.pj.tb_people.vo.ApplyPeopleVo;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import com.pj.utils.sg.*;
 import com.pj.project4sp.SP;
 
-import com.pj.current.satoken.StpUserUtil;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -96,7 +92,7 @@ public class TbPeopleController {
 
 	/** 审核 */
 	@PostMapping("judge")
-	public AjaxJson judge(TbPeople tbPeople){
+	public AjaxJson judge(@RequestBody TbPeople tbPeople){
 		boolean judge = tbPeopleService.judge(tbPeople);
 		if(judge){
 			return AjaxJson.getSuccess("审核成功!");
@@ -106,7 +102,7 @@ public class TbPeopleController {
 
 	/** 启/停 */
 	@PostMapping("isLock")
-	public AjaxJson isLock(StartStopDto startStopDto){
+	public AjaxJson isLock(@Validated @RequestBody StartStopDto startStopDto){
 		boolean lock = tbPeopleService.isLock(startStopDto);
 		return AjaxJson.getSuccess(lock + "");
 	}

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java

@@ -133,7 +133,7 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 		//获取启停状态
 		Integer isLock = startStopDto.getIsLock();
 		//设置启/停
-		tbPeople1.setStatus(isLock);
+		tbPeople1.setStatus(isLock == null || isLock.toString().trim().equals("")? tbPeople1.getIsLock(): isLock);
 		//保存结果
 		int i = tbPeopleMapper.updateById(tbPeople1);
 		//远程调用停用app user表中的边民账号

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersService.java

@@ -73,8 +73,10 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
 		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
 			throw new ServiceException("当前登陆用户信息已失效!");
+		//通过appUser表的fk字段查询二级市场的收购商表
 		TbPurchaser tbPurchaser = tbPurchaserMapper.selectById(appLoginInfo.getFk());
-		if(tbPurchaser == null)throw new ServiceException("您的身份不是收购商!");
+		if(tbPurchaser == null || tbPurchaser.getDeleteStatus() == 0 || tbPurchaser.getIsLock() == 0)
+			throw new ServiceException("您的身份不是收购商!");
 		//执行查询
 		so.set("create_by",appLoginInfo.getLoginId()); // 订单创建人为收购商
 		so.set("keyword",keyword); // 后期可根据关键字进行聚合模糊匹配查询