From 27ce5dbd577f5c5dbf7098b0f980d355a275266c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 11 五月 2023 19:09:06 +0800
Subject: [PATCH] DEMO初步完成
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java | 3 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java | 3 +
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ConsumerGoodsMapper.xml | 6 +-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java | 4 ++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java | 8 +++-
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 28 +++++++++-----
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java | 7 +++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java | 5 ++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteShopService.java | 4 +-
ruoyi-modules/ruoyi-system/pom.xml | 16 ++++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java | 14 ++++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 4 +-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java | 9 ++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 1
14 files changed, 90 insertions(+), 22 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteShopService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteShopService.java
index 5db5b4a..08cf8d9 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteShopService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteShopService.java
@@ -18,6 +18,6 @@
@PostMapping("/shop/getShop")
public R<Shop> getShop(@RequestBody Long shopId);
- @GetMapping("/shop/getShopByUserId")
- public R<ShopRelUserVo> getShopByUserId(Long userId);
+ @PostMapping("/shop/getShopByUserId")
+ public R<ShopRelUserVo> getShopByUserId(@RequestBody Long userId);
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
index 57703ff..18182e5 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
@@ -63,6 +63,15 @@
public R<SysUser> getSysUser(@RequestBody Long userId);
/**
+ * @description: TODO
+ * @author jqs34
+ * @date 2023/4/30 15:36
+ * @version 1.0
+ */
+ @PostMapping("/user/getSysUserBYmobile")
+ public R<SysUser> getSysUserBYmobile(@RequestBody String mobile);
+
+ /**
* @description: 更新用户手机
* @author jqs34
* @date 2023/4/30 15:32
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
index b3ef126..3b6b49f 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
@@ -32,8 +32,9 @@
/**
* 用户id
*/
- @TableId(value = "user_id",type = IdType.AUTO)
+ @TableId("user_id")
private Long userId;
+
/**
* 删除标记
*/
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java
index 8dd946a..d250f67 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysUser.java
@@ -3,6 +3,9 @@
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel;
@@ -23,6 +26,7 @@
/** 用户ID */
@Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+ @TableId(value = "user_id", type = IdType.AUTO)
private Long userId;
/** 部门ID */
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
index f3d4030..28969c8 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
@@ -50,6 +50,11 @@
}
@Override
+ public R<SysUser> getSysUserBYmobile(String mobile) {
+ return null;
+ }
+
+ @Override
public R<SysUser> registerUser(SysUser sysUser) {
return R.fail("注册用户失败:" + throwable.getMessage());
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index 86004d0..a7325ff 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -147,18 +147,20 @@
String password = "hongruitang";
sysUser.setPassword(SecurityUtils.encryptPassword(password));
sysUser = sysUserService.registerUser(sysUser).getData();
- log.info("sysUser1"+sysUser.toString());
+ log.info("sysUser1-----------------"+sysUser.toString());
member = new Member();
member.setUserId(sysUser.getUserId());
member.setDelFlag(0);
member.setNickName("鸿瑞堂用户");
member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
member.setMemberId(memberId);
+ member.setRelationShopId(1L);
member.setWxUnionid(unionid);
member.setMiniOpenid(openid);
member.setBindingFlag(0);
member.setCreateTime(new Date());
- this.save(member);
+ log.info("member-----------------"+member.toString());
+ this.saveOrUpdate(member);
}else{
log.info("member2"+member.toString());
@@ -234,16 +236,22 @@
} catch (Exception e) {
e.printStackTrace();
}
- //更新用户手机信息
- SysUser sysUser = new SysUser();
- sysUser.setUserId(appUserAuthorizeDto.getUserId());
- sysUser.setPhonenumber(mobile);
- sysUserService.updateUserMobile(sysUser);
- member.setMobile(mobile);
- member.setNickName(sysUser.getNickName());
+
+ SysUser sysUser1 = sysUserService.getSysUserBYmobile(mobile).getData();
+ if(sysUser1!=null){
+ member.setUserId(sysUser1.getUserId());
+ member.setNickName(sysUser1.getNickName());
+ }else{
+ //更新用户手机信息
+ SysUser sysUser = new SysUser();
+ sysUser.setUserId(appUserAuthorizeDto.getUserId());
+ sysUser.setPhonenumber(mobile);
+ sysUserService.updateUserMobile(sysUser);
+ member.setNickName(sysUser.getNickName());
+ }
this.saveOrUpdate(member);
appUserAuthorizeVo.setMobile(mobile);
- appUserAuthorizeVo.setNickName(sysUser.getNickName());
+ appUserAuthorizeVo.setNickName(member.getNickName());
appUserAuthorizeVo.setOpenid(member.getMiniOpenid());
appUserAuthorizeVo.setUnionid(member.getWxUnionid());
return appUserAuthorizeVo;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
index 21a93ff..f195a20 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
@@ -57,8 +57,9 @@
Page<AppSimpleGoodsVo> page = new Page<>();
page.setSize(appPageDto.getPageSize());
page.setCurrent(appPageDto.getPageNum());
+ //logger.info("shopId"+shopId.toString());
List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageRecommendGoods(page,shopId);
-
+ //logger.info("appSimpleGoodsVoList"+appSimpleGoodsVoList.toString());
return R.ok(page.setRecords(appSimpleGoodsVoList));
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ConsumerGoodsMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ConsumerGoodsMapper.xml
index 5dc6e36..0fc407a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ConsumerGoodsMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ConsumerGoodsMapper.xml
@@ -155,7 +155,7 @@
FROM t_consumer_goods tcg
INNER JOIN t_goods tg ON tcg.goods_id = tg.goods_id
INNER JOIN t_goods_file tgf ON tgf.goods_id = tg.goods_id AND tgf.del_flag = 0 AND tgf.file_type = 1
- WHERE tcg.del_flag = 0 AND tcg.user_id = #{param.userId} AND tcg.shop_id = #{param.shopId} AND tcg.service_status = 1
+ WHERE tcg.del_flag = 0 AND tcg.user_id = #{param.memberUserId} AND tcg.shop_id = #{param.shopId} AND tcg.service_status = 1
AND tcg.goods_type = 1 AND tcg.cycle_num_flag = 0
ORDER BY tcg.create_time DESC
</select>
@@ -176,7 +176,7 @@
FROM t_consumer_goods tcg
INNER JOIN t_goods tg ON tcg.goods_id = tg.goods_id
INNER JOIN t_goods_file tgf ON tgf.goods_id = tg.goods_id AND tgf.del_flag = 0 AND tgf.file_type = 1
- WHERE tcg.del_flag = 0 AND tcg.user_id = #{param.userId} AND tcg.shop_id = #{param.shopId} AND tcg.service_status = 1
+ WHERE tcg.del_flag = 0 AND tcg.user_id = #{param.memberUserId} AND tcg.shop_id = #{param.shopId} AND tcg.service_status = 1
AND tcg.goods_type = #{param.goodsType} AND tcg.cycle_num_flag = 1
ORDER BY tcg.create_time DESC
</select>
@@ -197,7 +197,7 @@
FROM t_consumer_goods tcg
INNER JOIN t_goods tg ON tcg.goods_id = tg.goods_id
INNER JOIN t_goods_file tgf ON tgf.goods_id = tg.goods_id AND tgf.del_flag = 0 AND tgf.file_type = 1
- WHERE tcg.del_flag = 0 AND tcg.user_id = #{param.userId} AND tcg.shop_id = #{param.shopId}
+ WHERE tcg.del_flag = 0 AND tcg.user_id = #{param.memberUserId} AND tcg.shop_id = #{param.shopId}
AND tcg.goods_type = #{param.goodsType} AND tcg.cycle_num_flag = 1
ORDER BY tcg.create_time DESC
</select>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
index d10738d..23ab52c 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -108,6 +108,7 @@
@ApiOperation(value = "修改员工信息")
public R editShopStaffInfo(@RequestBody MerEditUserDto merEditUserDto) {
Long userId = SecurityUtils.getUserId();
+ merEditUserDto.setUserId(userId);
shopStaffService.editShopStaffInfo(merEditUserDto);
return R.ok();
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
index 162e5e6..b266dd7 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
@@ -41,8 +41,8 @@
}
- @GetMapping("/getShopByUserId")
- public R<ShopRelUserVo> getShopByUserId(Long userId)
+ @PostMapping("/getShopByUserId")
+ public R<ShopRelUserVo> getShopByUserId(@RequestBody Long userId)
{
ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId);
Optional.ofNullable(shopRelUser).orElseThrow(() -> new ServiceException("未查询到商户信息"));
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index 467da7c..0b31cc1 100644
--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -106,6 +106,22 @@
<artifactId>mybatis-plus-generate</artifactId>
<version>2.3</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-test</artifactId>
+ <version>2.5.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>5.8.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
index 6060ef6..b357041 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
@@ -366,11 +366,15 @@
*/
@PostMapping("/registerUser")
public R<SysUser> registerUser(@RequestBody SysUser sysUser){
- userService.registerUser(sysUser);
+ sysUser = userService.registerUser(sysUser);
return R.ok(sysUser);
}
-
+ @PostMapping("/getSysUserBYmobile")
+ public R<SysUser> getSysUserBYmobile(@RequestBody String mobile){
+ SysUser sysUser = userService.getSysUserBYmobile(mobile);
+ return R.ok(sysUser);
+ }
/**
* @description: 更新用户手机
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
index 4e76bbb..d5bf2e3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
@@ -297,11 +297,23 @@
@Override
public SysUser registerUser(SysUser user)
{
- userMapper.insertUser(user);
+ int id = userMapper.insertUser(user);
+ log.info("user------------------"+user.toString());
return user;
}
/**
+ *
+ * @param mobile
+ * @return
+ */
+ @Override
+ public SysUser getSysUserBYmobile(String mobile){
+ SysUser sysUser = this.selectUserByPhoneNumber(mobile);
+ return sysUser;
+ }
+
+ /**
* 修改保存用户信息
*
* @param user 用户信息
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java
index bc1107f..26562de 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java
@@ -131,6 +131,13 @@
public SysUser registerUser(SysUser user);
/**
+ *
+ * @param mobile
+ * @return
+ */
+ SysUser getSysUserBYmobile(String mobile);
+
+ /**
* 修改用户信息
*
* @param user 用户信息
--
Gitblit v1.7.1