Browse Source

8.22 调整边民购买流程

Mechrevo 2 năm trước cách đây
mục cha
commit
11b85fb6f8
18 tập tin đã thay đổi với 306 bổ sung226 xóa
  1. 9 69
      sp-core/sp-api/src/main/java/com/pj/api/dto/OrderDto.java
  2. 4 4
      sp-core/sp-base/src/main/java/com/pj/enummj/ConfirmStatus.java
  3. 1 1
      sp-core/sp-base/src/main/java/com/pj/enummj/JudgeStatus.java
  4. 24 0
      sp-core/sp-base/src/main/java/com/pj/enummj/SellOut.java
  5. 3 2
      sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/GoodsTransitAppController.java
  6. 14 18
      sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/MethodGoodsTransitService.java
  7. 6 3
      sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransit.java
  8. 94 93
      sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransitService.java
  9. 7 0
      sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/param/PurchaseLevelOneGoodsTransitParam.java
  10. 4 4
      sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrder.java
  11. 7 7
      sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleAppController.java
  12. 11 0
      sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleController.java
  13. 23 7
      sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java
  14. 20 1
      sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/MethodPurchaserService.java
  15. 9 3
      sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserController.java
  16. 13 9
      sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserService.java
  17. 53 0
      sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/vo/PurchaserParamVo.java
  18. 4 5
      sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java

+ 9 - 69
sp-core/sp-api/src/main/java/com/pj/api/dto/OrderDto.java

@@ -20,66 +20,6 @@ public class OrderDto {
      */
     private Long applyNo;
 
-    public OrderDto(Integer cancelPeople, Long applyNo, Long id, Long tradeAreaId, String tradeAreaName, String addressIds, Long saleMainId, Long groupId, Long goodsId, String tradeNo, Long buyUserId, String buyUserName, String buyUserType, Long enterpriseId, String enterpriseName, Double totalWeight, Double totalPrice, Date tradeTime, Integer tradeStatus, String payType, String settleTime, Double realPrice, Double shouldPrice, Integer callCarStatus, Long settleUserId, Long recordUserId, String recordTime, String record, String refundReason, String refundTime, String receiveName, String receivePhone, String receiveAddress, String outTime, String goodsNames, Integer apply, String applyTime, String applyResult, String applyFailReason, String distribution, Integer peopleConfirm, Integer enterpriseConfirm, String pick, Date pickTime, Long shopId, String shopName, Integer send, String sendTime, Long levelTwoOrderId, Date createTime, Long createBy, String createName, Date updateTime, Long updateBy, String updateName, Integer deleteStatus, Integer finishStatus, Integer resaleStatus) {
-        this.cancelPeople = cancelPeople;
-        this.applyNo = applyNo;
-        this.id = id;
-        this.tradeAreaId = tradeAreaId;
-        this.tradeAreaName = tradeAreaName;
-        this.addressIds = addressIds;
-        this.saleMainId = saleMainId;
-        this.groupId = groupId;
-        this.goodsId = goodsId;
-        this.tradeNo = tradeNo;
-        this.buyUserId = buyUserId;
-        this.buyUserName = buyUserName;
-        this.buyUserType = buyUserType;
-        this.enterpriseId = enterpriseId;
-        this.enterpriseName = enterpriseName;
-        this.totalWeight = totalWeight;
-        this.totalPrice = totalPrice;
-        this.tradeTime = tradeTime;
-        this.tradeStatus = tradeStatus;
-        this.payType = payType;
-        this.settleTime = settleTime;
-        this.realPrice = realPrice;
-        this.shouldPrice = shouldPrice;
-        this.callCarStatus = callCarStatus;
-        this.settleUserId = settleUserId;
-        this.recordUserId = recordUserId;
-        this.recordTime = recordTime;
-        this.record = record;
-        this.refundReason = refundReason;
-        this.refundTime = refundTime;
-        this.receiveName = receiveName;
-        this.receivePhone = receivePhone;
-        this.receiveAddress = receiveAddress;
-        this.outTime = outTime;
-        this.goodsNames = goodsNames;
-        this.apply = apply;
-        this.applyTime = applyTime;
-        this.applyResult = applyResult;
-        this.applyFailReason = applyFailReason;
-        this.distribution = distribution;
-        this.peopleConfirm = peopleConfirm;
-        this.enterpriseConfirm = enterpriseConfirm;
-        this.pick = pick;
-        this.pickTime = pickTime;
-        this.shopId = shopId;
-        this.shopName = shopName;
-        this.send = send;
-        this.sendTime = sendTime;
-        this.levelTwoOrderId = levelTwoOrderId;
-        this.createTime = createTime;
-        this.createBy = createBy;
-        this.createName = createName;
-        this.updateTime = updateTime;
-        this.updateBy = updateBy;
-        this.updateName = updateName;
-        this.deleteStatus = deleteStatus;
-        this.finishStatus = finishStatus;
-        this.resaleStatus = resaleStatus;
-    }
 
     public Long getApplyNo() {
         return applyNo;
@@ -280,7 +220,7 @@ public class OrderDto {
     /**
      * 申报时间
      */
-    private String applyTime;
+    private Date applyTime;
 
     /**
      * 申报结果
@@ -338,9 +278,9 @@ public class OrderDto {
     private String sendTime;
 
     /**
-     * 对应二级市场中的收购单ID
+     * 大订单ID
      */
-    private Long levelTwoOrderId;
+    private Long collageOrdersId;
 
     /**
      * 创建时间
@@ -653,11 +593,11 @@ public class OrderDto {
         this.apply = apply;
     }
 
-    public String getApplyTime() {
+    public Date getApplyTime() {
         return applyTime;
     }
 
-    public void setApplyTime(String applyTime) {
+    public void setApplyTime(Date applyTime) {
         this.applyTime = applyTime;
     }
 
@@ -749,12 +689,12 @@ public class OrderDto {
         this.sendTime = sendTime;
     }
 
-    public Long getLevelTwoOrderId() {
-        return levelTwoOrderId;
+    public Long getCollageOrdersId() {
+        return collageOrdersId;
     }
 
-    public void setLevelTwoOrderId(Long levelTwoOrderId) {
-        this.levelTwoOrderId = levelTwoOrderId;
+    public void setCollageOrdersId(Long collageOrdersId) {
+        this.collageOrdersId = collageOrdersId;
     }
 
     public Date getCreateTime() {

+ 4 - 4
sp-core/sp-base/src/main/java/com/pj/enummj/EnterpriseConfirm.java → sp-core/sp-base/src/main/java/com/pj/enummj/ConfirmStatus.java

@@ -9,13 +9,13 @@ import lombok.Getter;
  **/
 @Getter
 @AllArgsConstructor
-public enum EnterpriseConfirm {
+public enum ConfirmStatus {
     /**
      * 商户订单确认情况
      */
-    ENTERPRISE_CONFIRM_ZERO(0,"待确认"),
-    ENTERPRISE_CONFIRM_ONE(1,"已确认"),
-    ENTERPRISE_CONFIRM_TWO(2,"拒绝");
+    CONFIRM_STATUS_ZERO(0,"待确认"),
+    CONFIRM_STATUS_ONE(1,"已确认"),
+    CONFIRM_STATUS_TWO(2,"拒绝");
 
     private Integer code;
 

+ 1 - 1
sp-core/sp-base/src/main/java/com/pj/enummj/JudgeStatus.java

@@ -13,7 +13,7 @@ public enum JudgeStatus {
 
     JUDGE_STATUS_ZERO(0,"待审核"),
     JUDGE_STATUS_ONE(1,"审核通过"),
-    JUDGE_STATUS_THREE(2,"审核不通过");
+    JUDGE_STATUS_TWO(2,"审核不通过");
 
     private Integer code;
 

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

@@ -0,0 +1,24 @@
+package com.pj.enummj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 07 26 10 26
+ **/
+@Getter
+@AllArgsConstructor
+public enum SellOut {
+
+    SELL_OUT_ZERO(1,"未售罄"),
+    SELL_OUT_ONE(2,"已售罄");
+
+    private Integer code;
+
+    private String msg;
+
+
+
+
+}

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

@@ -5,6 +5,7 @@ import com.pj.api.dto.GoodsTransitDto;
 
 import com.pj.common.core.exception.ServiceException;
 import com.pj.enummj.DeleteStatus;
+import com.pj.enummj.GoodsStatus;
 import com.pj.enummj.IsOrders;
 import com.pj.tb_goods_transit.param.PurchaseLevelOneGoodsTransitParam;
 import com.pj.tb_goods_transit.param.TransactionGoodsParam;
@@ -56,8 +57,8 @@ public class GoodsTransitAppController {
     @RequestMapping("getList")
     public AjaxJson getList() {
         SoMap so = SoMap.getRequestSoMap();
-        so.put("goodsStatus", 1);
-        so.put("isOrders", 0);
+        so.put("goodsStatus", GoodsStatus.GOODS_STATUS_ON.getCode());
+        so.put("isOrders", IsOrders.IS_ORDERS_ZERO.getCode());
         so.put("deleteStatus", DeleteStatus.DELETE_STATUS_ON.getCode());
 
         List<TbGoodsTransit> list = tbGoodsTransitService.getList(so.startPage());

+ 14 - 18
sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/MethodGoodsTransitService.java

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -103,19 +104,11 @@ public class MethodGoodsTransitService {
      * @return
      */
     public TbOrder setTbOrderProperties(TbGoodsTransit tbGoodsTransit, APPLoginUserInfo appLoginInfo){
-
-        //查询是否已存在该订单
-        List<TbOrder> tbOrderList = tbOrderMapper.selectList(
-                new LambdaQueryWrapper<TbOrder>()
-                        .eq(TbOrder::getGoodsId, tbGoodsTransit.getId())
-                        .ne(TbOrder::getEnterpriseConfirm, 2)// 2=一级市场商户已拒绝的订单
-                        .eq(TbOrder::getCancelPeople,0) // 0=该订单未被边民或者组长取消
-                        .eq(TbOrder::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode()));
-        if(tbOrderList.size() != 0)throw new RuntimeException("当前商品已存在订单,暂时无法继续下单!");
-
         //执行采购,创建一级市场订单表
         TbOrder tbOrder = new TbOrder();
-        List<TbPeople> tbPeopleList = tbPeopleMapper.selectList(new LambdaQueryWrapper<TbPeople>().eq(TbPeople::getId, appLoginInfo.getFk()).eq(TbPeople::getIsLock,IsLock.IS_LOCK_ON.getCode()).eq(TbPeople::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode()));
+        List<TbPeople> tbPeopleList = tbPeopleMapper.selectList(new LambdaQueryWrapper<TbPeople>()
+                .eq(TbPeople::getId, appLoginInfo.getFk()).eq(TbPeople::getIsLock,IsLock.IS_LOCK_ON.getCode())
+                .eq(TbPeople::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode()));
         if(tbPeopleList.size() != 1)throw new RuntimeException("当前用户信息有误!");
         //设置属性
         tbOrder.setGroupId(tbPeopleList.get(0).getGroupId());
@@ -125,15 +118,15 @@ public class MethodGoodsTransitService {
         tbOrder.setSaleMainId(Long.valueOf(tbGoodsTransit.getMerchantId()));
 		tbOrder.setTradeNo(SystemObject.getREFcode("YJSCDD",new Date()));  // 交易编号
         tbOrder.setBuyUserId(tbPeopleList.get(0).getId());
-        tbOrder.setBuyUserType(2 + "");
+        tbOrder.setBuyUserType(appLoginInfo.getUserType() == 1? 3 + "" : 2 + "");
         tbOrder.setBuyUserName(appLoginInfo.getLoginName());
         tbOrder.setCallCarStatus(0); // 叫车状态,默认未叫车
         tbOrder.setEnterpriseId(Long.valueOf(tbGoodsTransit.getMerchantId()));
         tbOrder.setEnterpriseName(tbGoodsTransit.getMerchantName());
         tbOrder.setTotalWeight(tbGoodsTransit.getGrossWeight());
         tbOrder.setTotalPrice(tbGoodsTransit.getPrice());
-        tbOrder.setCancelPeople(0); // 0=订单未取消,默认状态
-//		tbOrder.setTradeTime();  // 交易时间
+        tbOrder.setCancelPeople(1); // 1=默认边民确认
+		tbOrder.setTradeTime(new Date());  // 交易时间
 //		tbOrder.setPayType();  //交易类型
 //		tbOrder.setRealPrice();  // 当前结算金额
         tbOrder.setShouldPrice(tbGoodsTransit.getPrice());  //应结算金额
@@ -146,16 +139,19 @@ public class MethodGoodsTransitService {
         tbOrder.setGoodsUnit(tbGoodsTransit.getGoodsUnits());
         //设置下单时的默认状态
         tbOrder.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode()); // 删除状态默认是1,可用
-        tbOrder.setEnterpriseConfirm(EnterpriseConfirm.ENTERPRISE_CONFIRM_ZERO.getCode()); // 0为待商家确认
-        tbOrder.setPeopleConfirm(EnterpriseConfirm.ENTERPRISE_CONFIRM_ZERO.getCode()); // 0为待边民确认
+        tbOrder.setEnterpriseConfirm(ConfirmStatus.CONFIRM_STATUS_ZERO.getCode()); // 0为待商家确认
+        tbOrder.setPeopleConfirm(ConfirmStatus.CONFIRM_STATUS_ZERO.getCode()); // 0为待边民确认
         tbOrder.setSend(DeliverStatus.DELIVER_STATUS_ZERO.getCode());  // 0为未发货 1为已发货
-        tbOrder.setTradeStatus(TradeStatus.TRADE_STATUS_ZERO.getCode()); //支付状态默认是0,未支付
+        tbOrder.setTradeStatus(TradeStatus.TRADE_STATUS_ONE.getCode()); //支付状态默认是1,已支付
         tbOrder.setResaleStatus(ResaleStatus.RESALE_STATUS_ZERO.getCode()); // 是否转售状态,默认未转售 0
         tbOrder.setFinishStatus(OrderStatus.ORDER_STATUS_ZERO.getCode());  // 订单完成状态,默认未完成 0
         //订单表基本字段
         tbOrder.setCreateBy(appLoginInfo.getLoginId());
         tbOrder.setCreateName(appLoginInfo.getLoginName());
         tbOrder.setCreateTime(new Date());
+        //申报信息
+        tbOrder.setApply(ApplyStatus.APPLY_STATUS_ZERO.getCode()); // 默认待申报
+
 
         return tbOrder;
     }
@@ -232,7 +228,7 @@ public class MethodGoodsTransitService {
 
             HSSFCell cell9 = row.getCell(12);
             if (cell9 != null && (cell9.getCellType() == CellType.NUMERIC || cell9.getCellType() == CellType.FORMULA))
-                tbGoodsTransit.setStock((int)cell9.getNumericCellValue());
+                tbGoodsTransit.setStock(cell9.getNumericCellValue());
 
             HSSFCell cell10 = row.getCell(13);
             if (cell10 != null && (cell10.getCellType() == CellType.NUMERIC || cell10.getCellType() == CellType.FORMULA))

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

@@ -124,7 +124,7 @@ public class TbGoodsTransit extends Model<TbGoodsTransit> implements Serializabl
 	/**
 	 * 库存数量 
 	 */
-	private Integer stock;	
+	private Double stock;
 
 	/**
 	 * 商品状态(0=下架,1=在售) 
@@ -156,7 +156,7 @@ public class TbGoodsTransit extends Model<TbGoodsTransit> implements Serializabl
 	/**
 	 * 创建人编号 
 	 */
-	private String createBy;	
+	private String createBy;
 
 	/**
 	 * 创建人名称 
@@ -202,7 +202,10 @@ public class TbGoodsTransit extends Model<TbGoodsTransit> implements Serializabl
 	 */
 	private Integer enterpriseConfirm;
 
-
+	/**
+	 * 是否已售罄(0=未售罄,1=已售罄)
+	 */
+	private Integer sellOut;
 
 
 

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

@@ -3,10 +3,14 @@ package com.pj.tb_goods_transit;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -44,6 +48,7 @@ import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -53,6 +58,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.swing.filechooser.FileSystemView;
 
+import static com.pj.api.consts.FeignFactory.adminInterface;
+
 /**
  * Service: tb_goods_transit -- 审核商户在APP端发布的商品
  * @author qzy
@@ -70,40 +77,19 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 	/** 监管产品mapper */
 	@Autowired
 	private TbGoodsMapper tbGoodsMapper;
-
 	@Autowired
-	private SmsRetryService smsRetryService;
-
+	private TbOrderService tbOrderService;
 	@Autowired
-	private TbGoodsCartService tbGoodsCartService;
-
+	private TbOrderMapper tbOrderMapper;
 	/** 互市区mapper */
 	@Autowired
 	private TbTradeAreaMapper tbTradeAreaMapper;
-	/** 订单保存 */
-	@Autowired
-	private TbOrderMapper tbOrderMapper;
-	/** 边民 */
-	@Autowired
-	private TbPeopleMapper tbPeopleMapper;
-
-	@Autowired
-	private TbEnterpriseMapper tbEnterpriseMapper;
-
-	@Autowired
-	private TbGoodsCartMapper tbGoodsCartMapper;
-
-	@Autowired
-	private TbOrderService orderService;
+	/** 锁 */
+	private Lock lock = new ReentrantLock();
 
-	@Autowired
-	private MethodOrderService methodOrderService;
-
-	/**
-	 * 远程调用
-	 */
-	@Autowired
-	private AdminInterface adminInterface;
+	//边民的授信额度
+	//todo: @Value("${quota}")
+	 public static final Double QUOTA = 8000.0;
 
 	/** 增 */
 	void add(TbGoodsTransit t){
@@ -154,7 +140,7 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		//添加互市区条件
 		so.put("tradeAreaId",appLoginInfo.getTradeAreaId()); // 根据边民的所在互市区匹配其能查看的商品
 		so.put("merchantId", appLoginInfo.getFk()); // 外键
-		so.put("isOrders",0); // 未被下单
+		so.put("isOrders",IsOrders.IS_ORDERS_ZERO.getCode()); // 未被下单
 		so.set("auditStatus",AuditStatus.AUDIT_STATUS_ON.getCode()); // 审核通过
 		so.put("deleteStatus", DeleteStatus.DELETE_STATUS_ON.getCode()); // 未被逻辑删除
 		return tbGoodsTransitMapper.getList(so);
@@ -204,8 +190,6 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 
 	/** app端 - 添加需要交易的商品 */
 	public boolean transactionGoods(TransactionGoodsParam transactionGoodsParam){
-		//检查登录
-//		StpUtil.checkLogin();
 		//判断商品的净重毛重
 		Double netWeight = transactionGoodsParam.getNetWeight();
 		Double grossWeight = transactionGoodsParam.getGrossWeight();
@@ -228,28 +212,28 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		TbGoodsTransit tbGoodsTransit = new TbGoodsTransit();
 		BeanUtils.copyProperties(transactionGoodsParam,tbGoodsTransit);
 		//获取并保存当前商品基本信息
-		tbGoodsTransit.setTradeAreaName(tbTradeArea.getName());
-		tbGoodsTransit.setGoodsName(tbGoods.getName());
-		tbGoodsTransit.setDescription(tbGoods.getRemark());
-		tbGoodsTransit.setPlaceOrigin(tbGoods.getSource());
-		tbGoodsTransit.setGoodsUnits(tbGoods.getUnit());
-		tbGoodsTransit.setGoodsType(tbGoods.getTypeNames());
-		tbGoodsTransit.setGoodsImg(tbGoods.getAvatar());
+		tbGoodsTransit.setTradeAreaName(tbTradeArea.getName());  // 交易地区(互市区)
+		tbGoodsTransit.setGoodsName(tbGoods.getName());  // 商品名称
+		tbGoodsTransit.setDescription(tbGoods.getRemark());  // 商品描述
+		tbGoodsTransit.setPlaceOrigin(tbGoods.getSource()); // 商品产地
+		tbGoodsTransit.setGoodsUnits(tbGoods.getUnit());  // 商品单位
+		tbGoodsTransit.setGoodsType(tbGoods.getTypeNames()); // 商品类型名称
+		tbGoodsTransit.setGoodsImg(tbGoods.getAvatar());  // 商品图片
 		tbGoodsTransit.setGoodsId(tbGoods.getId());//保存监管商品表id
-		tbGoodsTransit.setShopId(transactionGoodsParam.getShopId());
-		tbGoodsTransit.setShopName(transactionGoodsParam.getShopName());
-
+		tbGoodsTransit.setShopId(transactionGoodsParam.getShopId());  // 商铺ID
+		tbGoodsTransit.setShopName(transactionGoodsParam.getShopName()); // 商铺名称
+		tbGoodsTransit.setSellOut(SellOut.SELL_OUT_ZERO.getCode());//默认商品未售罄
 		//商户编号
-		tbGoodsTransit.setMerchantId(appLoginInfo.getFk() + "");
+		tbGoodsTransit.setMerchantId(appLoginInfo.getFk() + ""); // appUser表的外键
 		//商户名称
-		tbGoodsTransit.setMerchantName(appLoginInfo.getLoginName());
+		tbGoodsTransit.setMerchantName(appLoginInfo.getLoginName());  // appUser表昵称
 
 		//保存海关商品表的主键到商品审核表上 todo:原计划是保存[海关申报单号],临时修改成保存海关商品表的主键
 		tbGoodsTransit.setDeclareOdd(String.valueOf(tbGoods.getId()));
 		//设置默认信息
 		tbGoodsTransit.setAuditStatus(AuditStatus.AUDIT_STATUS_ON.getCode());//默认已过审
-		tbGoodsTransit.setIsOrders(0);//默认未被下单
-		tbGoodsTransit.setEnterpriseConfirm(EnterpriseConfirm.ENTERPRISE_CONFIRM_ZERO.getCode());//商铺确认情况[0=待确认,1=已确认,2=拒绝]
+		tbGoodsTransit.setIsOrders(IsOrders.IS_ORDERS_ZERO.getCode());//默认未被下单
+		tbGoodsTransit.setEnterpriseConfirm(ConfirmStatus.CONFIRM_STATUS_ZERO.getCode());//商铺确认情况[0=待确认,1=已确认,2=拒绝]
 		//设置基本信息
 		tbGoodsTransit.setCreateTime(new Date());
 		tbGoodsTransit.setCreateBy(appLoginInfo.getLoginId() + "");
@@ -284,78 +268,95 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 	}
 
 	/**
+	 * 一级市场边民的购买操作
 	 * 采购一级市场的商品,
 	 * 包括加入购物车、购买、支付(暂时不做),
 	 * 下单后会向组内边民发送短信,
 	 * 通知其登录APP进行交易确认。
 	 */
 	public boolean purchaseLevelOntGoodsTransit(PurchaseLevelOneGoodsTransitParam purchaseLevelOntGoodsTransitParam) throws Exception {
-		//检查登录
-//		StpUtil.checkLogin();
 		//获取当前登陆人
 		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
 		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
 			throw new RuntimeException("当前登陆用户信息已失效!");
-		//判断当前登陆人是否为互市组组长
-		List<TbPeople> list = tbPeopleMapper.selectList
-				(new LambdaQueryWrapper<TbPeople>().eq(TbPeople::getId,appLoginInfo.getFk())
-						.eq(TbPeople::getRole, 2) // 1 边民 2组长
-						.eq(TbPeople::getIsLock, IsLock.IS_LOCK_ON.getCode())
-						.eq(TbPeople::getDeleteStatus, DeleteStatus.DELETE_STATUS_ON.getCode()));
-		if(list.size() != 1)throw new RuntimeException("您当前不属于互市组组长~");
 		//获取商品ID
 		String goodsTransitId = purchaseLevelOntGoodsTransitParam.getGoodsTransitId();
 		//查询商品
 		TbGoodsTransit tbGoodsTransit = tbGoodsTransitMapper.selectById(goodsTransitId);
 		if(tbGoodsTransit == null || tbGoodsTransit.getId() == null)
 			throw new RuntimeException("当前商品信息已失效!");
-		if(tbGoodsTransit.getGoodsStatus() == GoodsStatus.GOODS_STATUS_OFF.getCode())throw new ServiceException("该商品已下架,无法进行购买!");
+		if(tbGoodsTransit.getGoodsStatus().equals(GoodsStatus.GOODS_STATUS_OFF.getCode()))
+			throw new ServiceException("该商品已下架,无法进行购买!");
+		if(tbGoodsTransit.getSellOut().equals(SellOut.SELL_OUT_ONE.getCode()))
+			throw new ServiceException("该商品已售罄!");
+		//计算价格
+		double totalPrice = tbGoodsTransit.getPrice() * purchaseLevelOntGoodsTransitParam.getNumber();
+		//判断物价是否大于8000
+		if(totalPrice > QUOTA)
+			throw new ServiceException("您当前购物已大于授信额度,请检查购买信息。");
+		//查询当天是否已存在该订单
+		LocalDate today = LocalDate.now();
+		LocalDateTime startTime = LocalDateTime.of(today, LocalTime.MIN);
+		LocalDateTime endTime = LocalDateTime.of(today, LocalTime.MAX);
+		List<TbOrder> tbOrderList = tbOrderMapper.selectList(
+				new LambdaQueryWrapper<TbOrder>()
+						.eq(TbOrder::getCreateBy, appLoginInfo.getLoginId())
+						.between(TbOrder::getCreateTime,startTime,endTime)
+						.eq(TbOrder::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode()));
+		if(tbOrderList.size() != 0)throw new RuntimeException("当天已下订单,暂时无法继续下单!");
 		//检查是否属于海关允许销售商品
 		Long goodsId = tbGoodsTransit.getGoodsId();
 		TbGoods tbGoods = tbGoodsMapper.selectById(goodsId);
 		if(tbGoods == null)throw new RuntimeException("当前商品海关已不允许销售!");
-		//一天只能下一单
-		//1.查询数据库内是否有订单
-		LambdaQueryWrapper<TbOrder> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper.eq(TbOrder::getBuyUserId,appLoginInfo.getFk());  //边民表主键匹配
-		queryWrapper.apply("DATE(create_time) = DATE({0})", new Date()); // 匹配当天的数据
-		queryWrapper.ne(TbOrder::getEnterpriseConfirm,2); // 商户拒绝情况
-		queryWrapper.eq(TbOrder::getCancelPeople,0); // 组长或者边民未取消取消订单
-		List<TbOrder> orderList = tbOrderMapper.selectList(queryWrapper);
-		if(orderList.size() != 0){
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-			TbOrder tbOrder = orderList.get(0);
-			throw new ServiceException("您在 " + sdf.format(tbOrder.getCreateTime()) + " 已下单,请勿重复下单。");
-		}
-		//执行采购,创建一级市场订单表 , 该方法只是设置tbOrder的属性
-		TbOrder tbOrder = methodGoodsTransitService.setTbOrderProperties(tbGoodsTransit, appLoginInfo);
-		//执行保存 todo:创建订单
-		int insert = tbOrderMapper.insert(tbOrder);
-		if(insert == 1){
-			//删除购物车
-			tbGoodsCartMapper.deleteById(purchaseLevelOntGoodsTransitParam.getGoodsCartId());
-			//将商品信息改成已被下单
-			tbGoodsTransit.setIsOrders(1);
+		//查询该商品库存是否有库存
+		if(tbGoodsTransit.getStock() == 0.0)throw new ServiceException("当前商品已售罄!");
+		//判断数量是否足够
+		if(purchaseLevelOntGoodsTransitParam.getNumber() > tbGoodsTransit.getStock())
+			throw new ServiceException("购买数量已超上限!");
+		try{
+			//上锁
+			lock.lock();
+			// todo: 调用银行接口,判断当前边民是否有足够的额度
+			//执行购买
+			tbGoodsTransit.setStock(tbGoodsTransit.getStock() - purchaseLevelOntGoodsTransitParam.getNumber());
+			//如果商品的数量已售罄
+			if(tbGoodsTransit.getStock() < 0.0)
+				throw new ServiceException("购买异常!");
+			if(tbGoodsTransit.getStock() == 0.0)
+				tbGoodsTransit.setSellOut(SellOut.SELL_OUT_ONE.getCode());
+			//保存结果
 			int updateById = tbGoodsTransitMapper.updateById(tbGoodsTransit);
-			//执行给商家发送信息
 			if(updateById == 1){
-				//获取商家信息
-				TbEnterprise tbEnterprise = tbEnterpriseMapper.selectById(tbGoodsTransit.getMerchantId());
-				if(tbEnterprise == null)throw new RuntimeException("商家不存在!");
-
-				//todo:给商家发一条接单消息
-				MessageDto dto = new MessageDto();
-				dto.setUrl("/pages/market/one/merchant/order/list");
-				dto.setUserId(tbEnterprise.getId());
-				dto.setContents("你的发布的《" + tbGoodsTransit.getGoodsName() + "》已有人接单,请及时确认。");
-				adminInterface.messageSave(dto);
-				// 给组长旗下的所有边民发送message
-				methodOrderService.sendGroupMessage(list.get(0).getGroupId(),list.get(0).getName(),true);
-				//todo:通知短信
-//				return smsRetryService.sendSmsMsg(tbEnterprise.getContact());
-				return true;
+				//生成小订单
+				tbGoodsTransit.setPrice(totalPrice);
+				TbOrder tbOrder = methodGoodsTransitService.setTbOrderProperties(tbGoodsTransit, appLoginInfo);
+				boolean save = tbOrderService.save(tbOrder);
+				if(save){
+					//todo: 将交易成功信息推送给航通
+					//发送message给商家和买家
+					MessageDto dto = new MessageDto();
+					dto.setUrl("/pages/market/one/merchant/order/list");
+					dto.setUserId(Long.valueOf(tbGoodsTransit.getCreateBy()));
+					dto.setContents("你的商品 <<" + tbGoodsTransit.getGoodsName() + ">> " +
+							"已出售"+ purchaseLevelOntGoodsTransitParam.getNumber() +
+							tbGoodsTransit.getGoodsUnits() + "还剩 "+ tbGoodsTransit.getStock() +
+							tbGoodsTransit.getGoodsUnits() +",请前往查看。");
+					//执行message发送
+					adminInterface.messageSave(dto);
+					//执行发送买家
+					dto.setUrl("/pages/market/one/merchant/order/list");
+					dto.setUserId(appLoginInfo.getLoginId());
+					dto.setContents("购买商品 <<" + tbGoodsTransit.getGoodsName() + ">>成功!");
+					adminInterface.messageSave(dto);
+				}
 			}
+		}catch (Exception e){
+			e.printStackTrace();
+		}finally {
+			//解锁
+			lock.unlock();
 		}
+
 		throw new RuntimeException("订单预创建异常!");
 	}
 

+ 7 - 0
sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/param/PurchaseLevelOneGoodsTransitParam.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Author Mechrevo
@@ -22,6 +23,12 @@ public class PurchaseLevelOneGoodsTransitParam {
     /** 购物车ID */
     private Long goodsCartId;
 
+    /**
+     * 购买的商品的数量
+     */
+    @NotNull(message = "购买商品的数量")
+    private Double number;
+
 //    private String receiveName;
 //    private String receivePhone;
 //    private String receiveAddress;

+ 4 - 4
sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrder.java

@@ -220,7 +220,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	/**
 	 * 申报时间
 	 */
-	private String applyTime;
+	private Date applyTime;
 
 	/**
 	 * 申报结果
@@ -238,11 +238,11 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	private String distribution;
 
 	/**
-	 * 一级市场边民确认(0=待确认,1=是,2=否)[j]
+	 * 一级市场边民确认(0=待确认,1=是)[j]
 	 */
 	private Integer peopleConfirm;
 	/**
-	 * 一级市场商户确认(0=待确认,1=是,2=否)[j]
+	 * 一级市场商户确认(0=待确认,1=是)[j]
 	 */
 	private Integer enterpriseConfirm;
 
@@ -279,7 +279,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	/**
 	 * 对应二级市场中的收购单ID
 	 */
-	private Long levelTwoOrderId;
+	private Long collageOrdersId;
 
 	/**
 	 * 创建时间

+ 7 - 7
sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleAppController.java

@@ -36,13 +36,13 @@ public class TbPeopleAppController {
     }
 
 
-
-    /** 边民确认订单 */
-    @RequestMapping("confirmOrder")
-    public AjaxJson confirmOrder(@RequestParam("orderId")Long orderId){
-        tbPeopleService.confirmOrder(orderId);
-        return AjaxJson.getSuccess();
-    }
+//
+//    /** 边民确认订单 */
+//    @RequestMapping("confirmOrder")
+//    public AjaxJson confirmOrder(@RequestParam("orderId")Long orderId){
+//        tbPeopleService.confirmOrder(orderId);
+//        return AjaxJson.getSuccess();
+//    }
 
 
 

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

@@ -200,6 +200,17 @@ public class TbPeopleController {
         return AjaxJson.getSuccess("边民加入互助组成功");
     }
 
+    /**
+     * 边民扫脸确认进境申报
+     * @param orderID
+     * @return
+     */
+    @PostMapping("entryDeclaration")
+    public AjaxJson entryDeclaration(Long orderID){
+        boolean declaration = tbPeopleService.entryDeclaration(orderID);
+        if(declaration)return AjaxJson.getSuccess();
+        return AjaxJson.getError();
+    }
 
     /**
      * 数据导入接口

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

@@ -9,10 +9,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pj.api.client.admin.AdminInterface;
 import com.pj.api.dto.PeopleDto;
+import com.pj.common.core.exception.ServiceException;
 import com.pj.current.dto.PCLoginUserInfo;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.enummj.*;
-import com.pj.tb_goods_transit.TbGoodsTransitMapper;
 import com.pj.tb_group.TbGroup;
 import com.pj.tb_group.TbGroupMapper;
 import com.pj.tb_order.TbOrder;
@@ -64,12 +64,10 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 	/** 订单对象 */
 	@Autowired
 	private TbOrderMapper tbOrderMapper;
-	@Autowired
-	private TbGoodsTransitMapper tbGoodsTransitMapper;
-
 
 	@Autowired
 	TbGroupMapper tbGroupMapper;
+
 	/** 增 */
 	void add(TbPeople t){
 		t.setCreateTime(new Date())
@@ -198,7 +196,6 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 
 	/**
 	*边民申请加入互助组
-	*
 	* @author loovi
 	* @date
 	*/
@@ -236,7 +233,6 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
    }
    /**
    *组长获取待通过申请人列表
-   *
    * @author loovi
    * @date
    */
@@ -326,7 +322,27 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 		return false;
 	}
 
-
+	/**
+	 * 边民的进境申报,每个边民只负责自己的申报
+	 * @param orderId  订单表主键
+	 * @return
+	 */
+	public boolean entryDeclaration(Long orderId){
+		//todo:调用人脸识别,通过则执行下面方法,不通过直接返回false
+		//获取其对象并进行判断
+		TbOrder tbOrder = tbOrderMapper.selectById(orderId);
+		if(tbOrder == null)
+			throw new ServiceException("订单信息异常!");
+		//修改订单状态
+		tbOrder.setApplyTime(new Date()); // 申报时间
+		tbOrder.setPeopleConfirm(ConfirmStatus.CONFIRM_STATUS_ONE.getCode()); // 默认边民确认
+		tbOrder.setFinishStatus(OrderStatus.ORDER_STATUS_ONE.getCode()); // 订单状态已完成
+		int update = tbOrderMapper.updateById(tbOrder);
+		if(update == 1){
+			//todo: 调用航通接口,接收进境申报确认信息;并向海关进行进境申报
+		}
+		return update == 1;
+	}
 
 
 

+ 20 - 1
sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/MethodPurchaserService.java

@@ -4,11 +4,13 @@ import com.pj.enummj.DeleteStatus;
 import com.pj.enummj.IsLock;
 import com.pj.enummj.JudgeStatus;
 import com.pj.tb_purchaser.param.PurchaserParam;
+import com.pj.tb_purchaser.vo.PurchaserParamVo;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.DateUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -70,7 +72,7 @@ public class MethodPurchaserService {
         int age = currentYear - birthYear;
         tbPurchaser.setAge(age);
         //法人
-        tbPurchaser.setLegalPerson(purchaser.getDutyParagraph());
+        tbPurchaser.setLegalPerson(purchaser.getCorporateName());
         //身份证
         tbPurchaser.setIdCard(purchaser.getCorporateIdCard());
         //手机号
@@ -85,10 +87,27 @@ public class MethodPurchaserService {
         tbPurchaser.setBankName(purchaser.getBankName());
         //审核状态,默认待审核
         tbPurchaser.setJudgeStatus(JudgeStatus.JUDGE_STATUS_ZERO.getCode());
+        tbPurchaser.setDutyParagraph(purchaser.getDutyParagraph());
         return tbPurchaser;
     }
 
     /**
+     * 认证时封装收购商信息
+     * @param tbPurchaser
+     * @return
+     */
+    public PurchaserParamVo setPurchaserParamProperties(TbPurchaser tbPurchaser){
+        PurchaserParamVo purchaserParam = new PurchaserParamVo();
+        BeanUtils.copyProperties(tbPurchaser,purchaserParam);
+        purchaserParam.setLoginUserId(Long.valueOf(tbPurchaser.getCreateBy()));
+        purchaserParam.setDutyParagraph(tbPurchaser.getDutyParagraph());
+        purchaserParam.setCorporateName(tbPurchaser.getLegalPerson());
+        purchaserParam.setCorporateIdCard(tbPurchaser.getIdCard());
+        purchaserParam.setLinkPhone(tbPurchaser.getContact());
+        return purchaserParam;
+    }
+
+    /**
      * 方法抽取  导入
      * @param row
      * @param sheet

+ 9 - 3
sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserController.java

@@ -133,11 +133,17 @@ public class TbPurchaserController {
 	}
 
 
-	/** 收购商审核 */
+	/**
+	 *  收购商审核
+	 * @param id 商户ID
+	 * @param judgeStatus 审核状态(0=待审核,1=审核通过,2=审核驳回)
+	 * @param judgeContent 审核内容,不通过时的备注
+	 * @return
+	 */
 	@RequestMapping("audit")
 	@SaCheckPermission(TbPurchaser.PERMISSION_CODE_EDIT)
-	public AjaxJson audit(Long purchaserId,Boolean flag,String reason){
-		boolean line = tbPurchaserService.audit(purchaserId,flag,reason);
+	public AjaxJson audit(Long id,Integer judgeStatus,@RequestParam(value = "judgeContent",required = false) String judgeContent){
+		boolean line = tbPurchaserService.audit(id,judgeStatus,judgeContent);
 		if(line)return AjaxJson.getSuccess("认证完成!");
 		return AjaxJson.getError("认证失败!");
 	}

+ 13 - 9
sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserService.java

@@ -22,6 +22,7 @@ import com.pj.common.core.exception.ServiceException;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.enummj.*;
 import com.pj.tb_purchaser.param.PurchaserParam;
+import com.pj.tb_purchaser.vo.PurchaserParamVo;
 import com.pj.utils.sg.AjaxError;
 import com.pj.utils.so.SoMap;
 import org.apache.commons.lang3.StringUtils;
@@ -113,26 +114,28 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 	/**
 	 *  收购商审核
 	 * @param purchaserId 二级市场商户表主键
-	 * @param flag true=审核通过  false=审核失败
-	 * @param reason 审核备注
+	 * @param judgeStatus 审核状态(0=待审核,1=审核通过,2=审核驳回)
+	 * @param judgeContent 审核备注
 	 * @return
 	 */
-	public boolean audit(Long purchaserId,Boolean flag,String reason){
+	public boolean audit(Long purchaserId,Integer judgeStatus,String judgeContent){
 		//审核不通过
-		if(!flag){
+		if(judgeStatus.equals(JudgeStatus.JUDGE_STATUS_TWO.getCode())){
 			TbPurchaser selectById = tbPurchaserMapper.selectById(purchaserId);
 			if(selectById == null)throw new ServiceException("商户信息异常!");
-			selectById.setJudgeStatus(JudgeStatus.JUDGE_STATUS_THREE.getCode());
-			selectById.setJudgeContent(reason);
+			selectById.setJudgeStatus(JudgeStatus.JUDGE_STATUS_TWO.getCode());
+			selectById.setJudgeContent(judgeContent);
 			tbPurchaserMapper.updateById(selectById);
 			//发送通知给收购商
 			MessageDto dto = new MessageDto();
 			dto.setUrl("/pages/market/one/merchant/order/list");
 			dto.setUserId(purchaserId);
-			dto.setContents("您发起的收购商认证审核不通过,原因是: " + reason);
+			dto.setContents("您发起的收购商认证审核不通过,原因是: " + judgeContent);
 			adminInterface.messageSave(dto);
 			return true;
 		}
+		if(!judgeStatus.equals(1))
+			return false;
 		//审核通过
 		TbPurchaser tbPurchaser = tbPurchaserMapper.selectById(purchaserId);
 		if(tbPurchaser == null)throw new ServiceException("收购商信息异常。");
@@ -164,10 +167,11 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 	}
 
 	/** 获取审核状态 */
-	public TbPurchaser auditStatus(Long appUserId){
+	public PurchaserParamVo auditStatus(Long appUserId){
 		List<TbPurchaser> purchaserList = tbPurchaserMapper.selectList(new LambdaQueryWrapper<TbPurchaser>().eq(TbPurchaser::getCreateBy, appUserId).orderByDesc(TbPurchaser::getCreateTime));
 		if(purchaserList.size() == 0)return null;
-		return purchaserList.get(0);
+		PurchaserParamVo purchaserParam = methodPurchaserService.setPurchaserParamProperties(purchaserList.get(0));
+		return purchaserParam;
 	}
 	/** 收购商批量审核 */
 	public void auditBatch(List<Long> ids, Integer judgeStatus, String judgeContent) {

+ 53 - 0
sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/vo/PurchaserParamVo.java

@@ -0,0 +1,53 @@
+package com.pj.tb_purchaser.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 收购商认证入参
+ * @Author Mechrevo
+ * @Date 2023 08 02 10 56
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PurchaserParamVo {
+
+    /**
+     * 审核状态(0=未通过,1=已通过,2=不通过)
+     */
+    private Integer judgeStatus;
+
+    /**
+     * 审核意见
+     */
+    private String judgeContent;
+
+    private Long loginUserId;
+
+    private String name;
+
+    private String dutyParagraph;
+
+    private String corporateName;
+
+    private String corporateIdCard;
+
+    private String linkPhone;
+
+    private String bankNo;
+
+    private String bankName;
+
+    private String bankAccount;
+
+    private String businessLicense;
+
+    private String address;
+
+
+
+
+}

+ 4 - 5
sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java

@@ -69,10 +69,6 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 	private LevelOneServerInterface levelOneServerInterface;
 	@Autowired
 	private TransportInterface transportInterface;
-	@Autowired
-	private LevelTwoServerInterface levelTwoServerInterface;
-	@Autowired
-	private AdminInterface adminInterface;
 
 	@Autowired
 	AppUserLoginLogService appUserLoginLogService;
@@ -237,7 +233,7 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
         }
         //判断是否停用
         if (appUser.getStatus().equals("0")){
-            loginLog.setStatus("2");
+            loginLog.setStatus(IsLock.IS_LOCK_OFF.getCode() + "");
             appUserLoginLogService.save(loginLog);
             return AjaxJson.getError("该账户 " + appUser.getPhone() + " 已停用!");
         }
@@ -287,6 +283,9 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 				EnterpriseDto enterprise = levelOneServerInterface.getEnterpriseById(appUser.getFkId());
 				if(enterprise != null) info.setTradeAreaId(enterprise.getTradeAreaId());
 				break;
+			case 6:
+				//todo: 合作商身份
+				break;
 			default:
 				throw new SecurityException("身份信息有误");
 		}