瀏覽代碼

8.2 一级市场订单相关,查看与自己有关的订单

Mechrevo 2 年之前
父節點
當前提交
ba8ff8d554

+ 1 - 1
sp-core/sp-base/src/main/java/com/pj/current/dto/APPLoginUserInfo.java

@@ -12,5 +12,5 @@ public class APPLoginUserInfo implements Serializable {
     private Long loginId;
     private String loginName;
     private Long fk;
-    private String userType;
+    private Integer userType;
 }

+ 1 - 1
sp-service/level-one-server/src/main/java/com/pj/tb_goods_cart/TbGoodsCart.java

@@ -97,7 +97,7 @@ public class TbGoodsCart extends Model<TbGoodsCart> implements Serializable {
 	/**
 	 * 购买方式(2=互助组,3=个人购买) 
 	 */
-	private String buyType;	
+	private Integer buyType;
 
 	/**
 	 * 分配方式 

+ 1 - 1
sp-service/level-one-server/src/main/java/com/pj/tb_goods_cart/TbGoodsCartService.java

@@ -90,7 +90,7 @@ public class TbGoodsCartService extends ServiceImpl<TbGoodsCartMapper, TbGoodsCa
 		//购买的用户类型
 		tbGoodsCart.setBuyType(appUser.getUserType());
 		//购买方式,默认都是互助组进行购买
-		tbGoodsCart.setBuyType(2 + "");
+		tbGoodsCart.setBuyType(2);
 		//购买商品的重量
 		tbGoodsCart.setBuyWeight(goodsCartInfoDto.getBuyWeight());
 		//当前商品的单位

+ 57 - 0
sp-service/level-one-server/src/main/java/com/pj/tb_order/MethodOrderService.java

@@ -0,0 +1,57 @@
+package com.pj.tb_order;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.pj.common.core.exception.ServiceException;
+import com.pj.enummj.DeleteStatus;
+import com.pj.tb_people.TbPeople;
+import com.pj.tb_people.TbPeopleMapper;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 08 02 14 20
+ **/
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class MethodOrderService {
+
+    @Autowired
+    private TbOrderMapper tbOrderMapper;
+    @Autowired
+    private TbPeopleMapper tbPeopleMapper;
+
+    /**
+     * 根据类型返回对应的订单列表
+     * @param userType
+     */
+    public List<TbOrder> checkType(Integer userType, Long fk, SoMap so){
+        if(userType == null)return null;
+        if(fk == null)return null;
+        switch (userType){
+            case 1: //边民
+                TbPeople tbPeople = tbPeopleMapper.selectById(fk);
+                if(tbPeople == null)throw new ServiceException("当前用户未认证边民!");
+                //根据组进行匹配订单
+                so.set("group_id",tbPeople.getGroupId());
+                break;
+            case 2: //互市组组长
+                so.set("buy_user_id",fk);
+                break;
+            case 3: // 一级市场商家
+                so.set("enterprise_id",fk);
+                break;
+            default:
+                throw new RuntimeException("服务器繁忙~");
+        }
+        so.set("delete_status", DeleteStatus.DELETE_STATUS_ON.getCode());
+        return tbOrderMapper.getList(so);
+
+    }
+
+
+}

+ 9 - 0
sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderDto.java

@@ -30,6 +30,10 @@ public class TbOrderDto {
 	 *
 	 */
 	private Long tradeAreaId;
+	/**
+	 *
+	 */
+	private Long groupId;
 
 	/**
 	 *
@@ -39,6 +43,11 @@ public class TbOrderDto {
 	/**
 	 *
 	 */
+	private String goodsImg;
+
+	/**
+	 *
+	 */
 	private String addressIds;
 
 	/**

+ 12 - 3
sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderService.java

@@ -26,6 +26,9 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 	@Autowired
 	TbOrderMapper tbOrderMapper;
 
+	@Autowired
+	private MethodOrderService methodOrderService;
+
 	/** 增 */
 	void add(TbOrder t){
 		save(t);
@@ -55,13 +58,19 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 
 	/**
 	 * 查集合 - 根据条件(参数为空时代表忽略指定条件)
-	 * APP专用
+	 * APP专用 与该订单相关的任何人员能看
 	 * @param so
 	 * @return
 	 */
 	List<TbOrder> getAPPList(SoMap so) {
-		//todo: 与订单相关的人能看
-		return tbOrderMapper.getList(so);
+		//获取登录用户,登录的用户也许边民,互市组组长,一级市场商家
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
+			throw new RuntimeException("当前登录账号信息已失效!");
+		Integer userType = appLoginInfo.getUserType();
+		//与订单相关的人能看
+		List<TbOrder> tbOrderList = methodOrderService.checkType(userType,appLoginInfo.getFk(),so);
+		return tbOrderList;
 	}
 
 	/** 获取当前登陆人订单集合 */

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

@@ -60,7 +60,7 @@ public class AppUser extends Model<AppUser> implements Serializable {
 	/**
 	 * 类型(1=边民,2=组长,3=商户,4=收购商,5=司机) 
 	 */
-	private String userType;	
+	private Integer userType;
 
 	/**
 	 * 外联id,user_type=1=>边民ID;user_type=3=>商户ID 

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

@@ -133,7 +133,7 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		//手机号
 		appUser.setPhone(phone);
 		//注册身份
-		appUser.setUserType(registerDto.getType().toString());
+		appUser.setUserType(registerDto.getType());
 		//加密并设置登陆密码
 		String password = registerDto.getPassword();
 		String encode = passwordEncoder.encode(password);