diff --git a/ant-design-vue-jeecg/src/views/shopping/components/collection.vue b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue new file mode 100644 index 00000000..2a2646ec --- /dev/null +++ b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue @@ -0,0 +1,301 @@ + + + + + diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue index cc65aeff..7266bd37 100644 --- a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue +++ b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue @@ -50,6 +50,79 @@ +
+
+ + + + + + + + + + + + + + + + + + + + + + + 我已阅读并同意黄淮服装定制商城的销售条款和个人信息处理规则 + + + 我同意按照《个人信息处理规则》告知的内容跨境提供本人的个人信息 + + + +
+
修改信息
+
+ 更改密码? + +
+
+
@@ -84,8 +157,10 @@
+ + diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/service/IZyGoodsService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/service/IZyGoodsService.java index c25dfaa0..27f410d7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/service/IZyGoodsService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/service/IZyGoodsService.java @@ -1,5 +1,6 @@ package org.jeecg.modules.demo.zygoods.service; +import org.jeecg.modules.demo.ordergoods.entity.OrderGoodsJk; import org.jeecg.modules.demo.zygoods.entity.ZyGoods; import com.baomidou.mybatisplus.extension.service.IService; @@ -13,5 +14,7 @@ import java.util.List; */ public interface IZyGoodsService extends IService { public List selectByMainId(String mainId); + //随机获取商品 + List SJgetOrder(); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/service/impl/ZyGoodsServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/service/impl/ZyGoodsServiceImpl.java index 90463972..8e5531e3 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/service/impl/ZyGoodsServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/service/impl/ZyGoodsServiceImpl.java @@ -1,5 +1,7 @@ package org.jeecg.modules.demo.zygoods.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.jeecg.modules.demo.ordergoods.entity.OrderGoodsJk; import org.jeecg.modules.demo.zygoods.entity.ZyGoods; import org.jeecg.modules.demo.zygoods.mapper.ZyGoodsMapper; import org.jeecg.modules.demo.zygoods.service.IZyGoodsService; @@ -8,6 +10,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.ArrayList; import java.util.List; /** @@ -26,4 +29,43 @@ public class ZyGoodsServiceImpl extends ServiceImpl impl return zyGoodsMapper.selectByMainId(mainId); } + /** + * 随机获取商品 + * @return + */ + @Override + public List SJgetOrder() { + List orderGoodsJkList = new ArrayList<>(); + QueryWrapper wrapper = new QueryWrapper<>(); + List goodsList = baseMapper.selectList(wrapper); + if(goodsList.size()>10){ + //随机取商品数(1-5)个 + int number = (int)(Math.random()*5)+1; + for(int i = 0 ; i < number ; i++){ + //goodsList的随机下标数 + int numberxb = (int)(Math.random()*goodsList.size()); + //随机取商品数量(1-5)个 + int numbersl = (int)(Math.random()*5)+1; + OrderGoodsJk orderGoodsJk = new OrderGoodsJk(); + orderGoodsJk.setGoodsId(goodsList.get(numberxb).getId()); + orderGoodsJk.setGoodsNum(numbersl); + orderGoodsJkList.add(orderGoodsJk); + } + }else{ + if(goodsList.size()>0){ + //goodsList的随机下标数 + int numberxb1 = (int)(Math.random()*goodsList.size()); + //随机取商品数量(1-5)个 + int numbersl = (int)(Math.random()*5)+1; + OrderGoodsJk orderGoodsJk = new OrderGoodsJk(); + orderGoodsJk.setGoodsId(goodsList.get(numberxb1).getId()); + orderGoodsJk.setGoodsNum(numbersl); + orderGoodsJkList.add(orderGoodsJk); + } + + } + + return orderGoodsJkList; + } + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java new file mode 100644 index 00000000..b1fd59ac --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java @@ -0,0 +1,157 @@ +package org.jeecg.modules.system.controller; + + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.google.common.base.Joiner; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.aspectj.apache.bcel.generic.RET; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.modules.base.service.BaseCommonService; +import org.jeecg.modules.demo.customercollectgoods.entity.Customercollectgoods; +import org.jeecg.modules.demo.customercollectgoods.service.ICustomercollectgoodsService; +import org.jeecg.modules.demo.customershoppingcart.entity.CustomerShoppingCart; +import org.jeecg.modules.demo.customershoppingcart.service.ICustomerShoppingCartService; +import org.jeecg.modules.demo.zygoods.entity.ZyGoods; +import org.jeecg.modules.demo.zygoods.service.IZyGoodsService; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.service.ISysUserService; +import org.jeecg.modules.system.vo.Grzx1; +import org.jeecg.modules.system.vo.Grzx2; +import org.jeecg.modules.system.vo.Grzx3; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpRequest; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.lang.reflect.Field; +import java.util.*; +import java.util.stream.Collectors; + +/* + 这个是个人中心专用控制器，之前全都写在SysUserController（用户控制器里面，感觉不妥）因此就专门拖出来一个 + */ + +@Slf4j +@RestController +@RequestMapping("/getuserpersion") +public class ApeopersionController { + + @Autowired + private ISysUserService sysUserService; + + @Autowired + private ICustomercollectgoodsService customercollectgoodsService; + + @Autowired + private IZyGoodsService zyGoodsService; + + @Autowired + private ICustomerShoppingCartService customerShoppingCartService; + + + /* + 个人中心，我的账户的数据获取 + */ + @RequestMapping(value = "/getneeduser", method = RequestMethod.GET) + public Result getdingdandh() { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String id = loginUser.getId(); + SysUser syu = new SysUser(); + syu = sysUserService.getneeduser(id); + findgoods(); + return Result.ok(syu); + } + +//个人中心的我的账户页面需要的数据 + @RequestMapping(value = "/updateneeduser", method = RequestMethod.GET) + public Result updateneeduser(@RequestParam(name = "form", required = true) String form) { + + Map map = JSON.parseObject(form,Map.class); + String id = (String) map.get("id"); + String sex= map.get("sex").toString(); + String birthday= (String) map.get("birthday"); + String realname= (String) map.get("realname"); + String phone= (String) map.get("phone"); + String email= (String) map.get("email"); + sysUserService.updateneed(id,sex,birthday,realname,phone,email); + + return Result.ok("success"); + } + + //个人中心的我的收藏的首页需要的数据 + @RequestMapping(value = "/findallcg", method = RequestMethod.GET) + public Result findgoods() { + //获取当前登人的信息 + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String userid = loginUser.getUsername(); + List g3 = new ArrayList<>(); + //根据当前登的人获取收藏夹里面的搜藏的商品的名称及其款式 + g3 = sysUserService.getscgoods(userid); + //获取的是辅料 + List s1 =new ArrayList<>(); + //获取的是面料 + List s2 =new ArrayList<>(); + //把获取的商品信息导入到新的list里面 + for (int i=0;i findgoods(@RequestParam(name = "id", required = true) String id) { + //这里方便获取当前登陆信息 + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //这里获取当前登陆的id + String userid = loginUser.getId(); + //这里获取当前登陆的真实姓名 + String rlname = loginUser.getRealname(); + //这个是根据goodid查询收藏的场频的信息 + Customercollectgoods ccs = customercollectgoodsService.getById(id); + String goodid= ccs.getGoodsId(); + //根据goodid查询goods的对象 + ZyGoods zyd =zyGoodsService.getById(goodid); + //初始化购物车对象 + CustomerShoppingCart cst =new CustomerShoppingCart(); + //开始组装购物车对象 + cst.setUserId(userid); + cst.setUsername(rlname); + cst.setGoodsId(zyd.getId()); + cst.setGoodsname(zyd.getGoodsName()); + cst.setNumber(1); + cst.setPrice(zyd.getPromotionPrice()); + cst.setZj(zyd.getPromotionPrice() * 1); + cst.setPlaceorigin(zyd.getPlaceOrigin()); + cst.setGoodimg(zyd.getDefaultPicture()); + cst.setStyleId(zyd.getStyleId()); + customerShoppingCartService.save(cst); + return Result.ok("添加完成"); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java index 84fcb388..0708aed7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java @@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import org.jeecg.modules.orderbymakeclothplan.pojo.ZyOrder; import org.jeecg.modules.system.entity.SysUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.Grzx3; import org.jeecg.modules.system.vo.SysUserDepVo; import java.util.List; @@ -164,4 +166,25 @@ public interface SysUserMapper extends BaseMapper { @Select("select * from zy_order where id =#{id}") ZyOrder getallzyo(String id); + + + //这个是根据roleid查询用户id + @Select("select user_id from sys_user_role where role_id =#{roleid}") + List getuserids(String roleid); + + //根据id获取用户 + @Select("select * from sys_user where id=#{needid}") + SysUser getneeduser(String needid); + + //个人中心我的账户修改个人信息 + @Update("UPDATE sys_user SET realname = #{realname},sex=#{sex},birthday=#{birthday},phone=#{phone},email=#{email} WHERE id = #{id} ") + void updateneed(String id, String sex, String birthday, String realname, String phone, String email); + + List getscgoods(String userid); + + @Select("SELECT zf.name FROM customercollectgoods AS crg LEFT JOIN goods_fabric AS gf ON crg.goods_id = gf.goods_id LEFT JOIN zy_fabric AS zf ON gf.fabric_id = zf.id WHERE crg.id=#{id}") + List getscgoodml(String id); + + @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 getscgoodfi(String id); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml index fb4af157..933fa6d0 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml @@ -198,4 +198,14 @@ WHERE og.id=#{id} + + + + + diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java index 533604e7..3c7fb2d7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java +++ b/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.Grzx3; import org.springframework.transaction.annotation.Transactional; import java.util.Collection; @@ -263,4 +264,20 @@ public interface ISysUserService extends IService { //这个是用于获取一个订单的全部信息 ZyOrder getallzyo(String id); + + + //这里是产生一个随机虚拟用户,用于虚拟下单 + SysUser getuser(); + + + SysUser getneeduser(String id); + + void updateneed(String id, String sex, String birthday, String realname, String phone, String email); + + //此处用于个人中心获取收藏商品的信息 + List getscgoods(String userid); + //此处用于个人中心获取收藏商品的面料 + List getscgoodml(String id); + //此处用于个人中心获取收藏商品的辅料 + List getscgoodfi(String id); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index f1022795..a76e56a1 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -23,6 +23,7 @@ import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.service.ISysUserService; import org.jeecg.modules.system.vo.Grzx1; import org.jeecg.modules.system.vo.Grzx2; +import org.jeecg.modules.system.vo.Grzx3; import org.jeecg.modules.system.vo.SysUserDepVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -561,4 +562,46 @@ public class SysUserServiceImpl extends ServiceImpl impl return userMapper.getallzyo(id); } + //这个是获取一个虚拟用户的对象 + @Override + public SysUser getuser() { + //虚拟角色id + String roleid="1630020854744330241"; + //根据角色id查询用户id + List uids = new ArrayList<>(); + //获取用户id的合集 + uids = userMapper.getuserids(roleid); + Random random = new Random(); + int n = random.nextInt(uids.size()); + String needid = uids.get(n); + SysUser sysUser = new SysUser(); + sysUser = userMapper.getneeduser(needid); + return sysUser; + } + + @Override + public SysUser getneeduser(String id) { + return userMapper.getneeduser(id); + } + + @Override + public void updateneed(String id, String sex, String birthday, String realname, String phone, String email) { + userMapper.updateneed(id,sex,birthday,realname,phone,email); + } + + @Override + public List getscgoods(String userid) { + return userMapper.getscgoods(userid); + } + + @Override + public List getscgoodml(String id) { + return userMapper.getscgoodml(id); + } + + @Override + public List getscgoodfi(String id) { + return userMapper.getscgoodfi(id); + } + }