Merge remote-tracking branch 'origin/master'

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -186,4 +186,10 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     @Select("SELECT za.contents FROM customercollectgoods  AS crg  LEFT JOIN goods_accessories AS ga ON crg.goods_id = ga.goods_id LEFT JOIN zy_accessories AS za ON ga.accessories_id = za.id where crg.id=#{id}")
     List<String> getscgoodfi(String id);
+
+    @Select("select id from customer_receiving_address where update_by =#{needuname}")
+    List<String> getuserdizhi(String needuname);
+
+    @Select("select id from customer_invoice where update_by =#{needuname}")
+    List<String> getuserfapiao(String needuname);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -12,6 +12,7 @@ import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
 import org.jeecg.modules.system.vo.Grzx1;
 import org.jeecg.modules.system.vo.Grzx2;
+import org.jeecg.modules.system.vo.SysUserdfVO;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
@@ -266,7 +267,7 @@ public interface ISysUserService extends IService<SysUser> {
 
 
 	//这里是产生一个随机虚拟用户,用于虚拟下单
-	SysUser getuser();
+	SysUserdfVO getuser();
 
 
 	SysUser getneeduser(String id);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -25,6 +25,7 @@ import org.jeecg.modules.system.vo.Grzx1;
 import org.jeecg.modules.system.vo.Grzx2;
 
 import org.jeecg.modules.system.vo.SysUserDepVo;
+import org.jeecg.modules.system.vo.SysUserdfVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
@@ -564,7 +565,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	//这个是获取一个虚拟用户的对象
 	@Override
-	public SysUser getuser() {
+	public SysUserdfVO getuser() {
 		//虚拟角色id
 		String roleid="1630020854744330241";
 		//根据角色id查询用户id
@@ -576,7 +577,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		String needid = uids.get(n);
 		SysUser sysUser = new  SysUser();
 		sysUser = userMapper.getneeduser(needid);
-		return sysUser;
+		String needuname = sysUser.getUsername();
+		List<String> dizhi = userMapper.getuserdizhi(needuname);
+		List<String> fapiao = userMapper.getuserfapiao(needuname);
+		SysUserdfVO sdfvo = new SysUserdfVO();
+		sdfvo.setSysUser(sysUser);
+		sdfvo.setDizhi(dizhi);
+		sdfvo.setFapiao(fapiao);
+		return sdfvo;
 	}
 
 	@Override

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysUserdfVO.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.system.vo;
+
+import lombok.Data;
+import org.jeecg.modules.system.entity.SysUser;
+
+import java.util.List;
+
+@Data
+public class SysUserdfVO {
+    private SysUser sysUser;
+    private List<String> fapiao;
+    private List<String> dizhi;
+}