springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java
@@ -74,16 +74,6 @@ return communityService.shopCartList(userId); } @ApiOperation(value = "查询用户购物车商品数量") @PostMapping("shopCartUserTotal") public R shopCartUserTotal() { Long userId = this.getUserId(); if(userId == null){ return R.fail("请重新登陆"); } return communityService.shopCartUserTotal(userId); } @ApiOperation(value = "购物车添加") @PostMapping("shopAddCart") public R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO) { springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java
@@ -96,7 +96,6 @@ administratorsUserVO.setStatus(1); administratorsUserVO.setPhone(storeVO.getPhone()); administratorsUserVO.setRoleId(888888888l); administratorsUserVO.setName(storeVO.getContacts()); administratorsUserVO.setShopStoreName(storeVO.getName()); administratorsUserVO.setShopStorePhone(storeVO.getPhone()); R r = userService.addUserBackstage(administratorsUserVO); @@ -204,8 +203,8 @@ @ApiOperation(value = "订单_分页列表", response = ComShopOrderSearchVO.class) @PostMapping("/order/page") public R page(@RequestBody @Validated PageComShopOrderSearchDTO pageComShopOrderSearchDTO) { pageComShopOrderSearchDTO.setUserId(this.getUserId()); ClazzUtils.setIfStringIsEmpty(pageComShopOrderSearchDTO); //pageComShopOrderSearchDTO.setUserId(this.getUserId()); //ClazzUtils.setIfStringIsEmpty(pageComShopOrderSearchDTO); return communityService.pageShopOrder(pageComShopOrderSearchDTO); }
@@ -36,8 +36,8 @@ @ApiModelProperty("商品主图") private String goodsPic; @ApiModelProperty("商品详情") private String details; @ApiModelProperty("商品描述") private String goodsDescribe; @ApiModelProperty("商品规格") private List<AddShopGoodsAttrVO> goodsAttrVOList; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java
@@ -74,8 +74,4 @@ @ApiModelProperty("id") private Long id; @ApiModelProperty("商家简介") @Size(max = 25,min = 1,message = "简介长度不符合！") private String storeDescribe; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1918,14 +1918,6 @@ R shopCartList(@RequestParam("userId") Long userId); /** * 查询用户购物车数量 * @param userId 用户id * @return 用户购物车商品数量 */ @PostMapping("/shop/shopCartUserTotal") R shopCartUserTotal(@RequestParam("userId") Long userId); /** * 购物车添加 * @param comShopCartDTO 请求参数 * @return 购物车列表 @@ -2086,6 +2078,13 @@ R getUserStoreInfo(@RequestParam("userId") Long userId); /** * 获取用户商户详情 * @param account 用户账号 */ @GetMapping("/shop/getUserStoreInfoByAccount") R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account); /** * 订单导出信息 * @param comShopOrderExportDTO 订单导出信息 * @return 订单导出信息 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -118,6 +118,16 @@ public R getUserStoreInfo(@RequestParam("userId") Long userId) { return comShopStoreService.getUserStoreInfo(userId); } /** * 获取用户商铺详细 * * @param account 用户账号 * @return */ @GetMapping("/getUserStoreInfoByAccount") public R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account) { return comShopStoreService.getUserStoreInfo(account); } /** * 添加商城后台日志 @@ -190,16 +200,6 @@ @PostMapping("shopCartList") public R shopCartList(@RequestParam("userId") Long userId) { return comShopCartService.shopCartList(userId); } /** * 查询用户购物车数量 * @param userId 用户id * @return 用户购物车商品数量 */ @PostMapping("shopCartUserTotal") public R shopCartUserTotal(@RequestParam("userId") Long userId) { return comShopCartService.shopCartUserTotal(userId); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
@@ -22,7 +22,7 @@ "select id,`name`,store_password,contacts,store_account,classify_id,logo,phone,delivery_type,remark,`status`," + "sale,sale_volume,store_detail,create_at from com_shop_store c" + " <where>" + " and c.delete_status=1 and c.status = 1 " + "c.delete_status=1" + "<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != ""'>" + "and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%') \n" + " </if> " + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopCartService.java
@@ -43,13 +43,6 @@ */ R shopDelCart(List<Long> Ids); /** * 查询用户购物车商品数量 * @param userId 用户id * @return 用户购物车商品数量 */ R shopCartUserTotal(Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopStoreService.java
@@ -66,8 +66,14 @@ /** * 获取用户商铺信息 * @param userId * @param userId 用户ID * @return */ R getUserStoreInfo(Long userId); /** * 获取用户商铺信息 * @param account 用户账号 * @return */ R getUserStoreInfo(String account); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopCartServiceImpl.java
@@ -208,28 +208,4 @@ return R.fail("修改失败"); } } /** * 查询用户购物车商品数量 * @param userId 用户id * @return 用户购物车商品数量 */ public R shopCartUserTotal(Long userId){ int goodsNum = 0; //查询用户购物车所有商品集合 List<ComShopCartDO> shopCartDOList = this.baseMapper.selectList(new QueryWrapper<ComShopCartDO>().eq("user_id",userId)); if(!shopCartDOList.isEmpty()){ for (ComShopCartDO cartDO:shopCartDOList) { //查询当前商品是否是有效商品 ComShopGoodsDO goodsDO = shopGoodsDAO.selectOne(new QueryWrapper<ComShopGoodsDO>() .eq("id",cartDO.getGoodsId()).eq("delete_status",ComShopGoodsDO.deleteStatus.no) .eq("status",ComShopGoodsDO.status.sell)); if(goodsDO != null){ goodsNum++; } } } return R.ok(goodsNum); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
@@ -55,17 +55,18 @@ String[] images = addShopGoodsVO.getGoodsPic().split(","); ComShopGoodsDO shopGoodsDO = new ComShopGoodsDO(); BeanUtils.copyProperties(addShopGoodsVO, shopGoodsDO); if (images.length > 1) { if(images.length>1){ shopGoodsDO.setGoodsPic(images[0]); } shopGoodsDO.setImages(addShopGoodsVO.getGoodsPic()); shopGoodsDO.setSale(0); shopGoodsDO.setDetails(addShopGoodsVO.getDetails()); shopGoodsDO.setDetails(addShopGoodsVO.getGoodsDescribe()); int goodsId = this.baseMapper.insert(shopGoodsDO); if (goodsId > 0) { ArrayList<ComShopGoodsAttrDO> goodsAttrDOS = Lists.newArrayList(); ComShopGoodsDO goodDO = this.baseMapper.selectById(shopGoodsDO.getId()); addShopGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {//维护商品规格表 addShopGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> { ComShopGoodsDO goodDO = this.baseMapper.selectById(shopGoodsDO.getId()); //维护商品规格表 if (goodDO == null) { throw new ServiceException("商家id不存在！"); } @@ -73,23 +74,17 @@ shopGoodsAttrDO.setGoodsId(shopGoodsDO.getId()); shopGoodsAttrDO.setStoreId(goodDO.getStoreId()); shopGoodsAttrDO.setGoodsName(goodDO.getName()); shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr()); //如果没有规格加默认 if(StringUtils.isNotEmpty(goodsAttr.getGoodsAttr())){ shopGoodsAttrDO.setGoodsAttr("默认"); }else{ shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr()); } shopGoodsAttrDO.setIsDefault(1); shopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice()); shopGoodsAttrDO.setAttrPic(images[0]); goodsAttrDOS.add(shopGoodsAttrDO); }); if (addShopGoodsVO.getGoodsAttrVOList().size() < 1) {//如果没有规格参数加默认 ComShopGoodsAttrDO shopGoodsAttrDO = new ComShopGoodsAttrDO(); shopGoodsAttrDO.setGoodsId(shopGoodsDO.getId()); shopGoodsAttrDO.setStoreId(goodDO.getStoreId()); shopGoodsAttrDO.setGoodsName(goodDO.getName()); shopGoodsAttrDO.setGoodsAttr("默认"); shopGoodsAttrDO.setIsDefault(1); shopGoodsAttrDO.setPrice(goodDO.getPrice()); shopGoodsAttrDO.setAttrPic(images[0]); goodsAttrService.save(shopGoodsAttrDO); } if (goodsAttrDOS.size() > 0) { goodsAttrService.saveBatch(goodsAttrDOS); } @@ -101,9 +96,9 @@ public R pageGoodsList(PageComShopGoodsDTO pageComShopGoodsDTO) { Page page = new Page<>(pageComShopGoodsDTO.getPageNum(), pageComShopGoodsDTO.getPageSize()); IPage<PageShopGoodsVO> comShopStoreVOIPage = this.baseMapper.pageShopGoods(page, pageComShopGoodsDTO); if (!comShopStoreVOIPage.getRecords().isEmpty()) { if(!comShopStoreVOIPage.getRecords().isEmpty()){ comShopStoreVOIPage.getRecords().forEach(shopGoods -> { List<ComShopGoodsAttrDO> goodsAttrDOs = shopGoodsAttrDAO.selectList(new QueryWrapper<ComShopGoodsAttrDO>().lambda().eq(ComShopGoodsAttrDO::getGoodsId, shopGoods.getId())); List<ComShopGoodsAttrDO> goodsAttrDOs = shopGoodsAttrDAO.selectList(new QueryWrapper<ComShopGoodsAttrDO>().lambda().eq(ComShopGoodsAttrDO::getGoodsId,shopGoods.getId())); ArrayList<AddShopGoodsAttrVO> goodsAttrVOList = Lists.newArrayList(); for (ComShopGoodsAttrDO oneGoodsAttrDO : goodsAttrDOs) { AddShopGoodsAttrVO goodsAttrVO = new AddShopGoodsAttrVO(); @@ -144,7 +139,7 @@ if (goodsAttrDO == null) { //如果没有规格加默认 shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr()); } else { }else{ shopGoodsAttrDO.setGoodsAttr("默认"); } shopGoodsAttrDO.setIsDefault(1); @@ -189,13 +184,13 @@ * @return 商品列表 */ @Override public R pageShopGoods(ComShopGoodsDTO comShopGoodsDTO) { Page page = new Page<>(comShopGoodsDTO.getPageNum(), comShopGoodsDTO.getPageSize()); IPage<ComShopGoodsVO> goodsVOIPage = this.baseMapper.pageShopGoodByApps(page, comShopGoodsDTO); if (!goodsVOIPage.getRecords().isEmpty()) { public R pageShopGoods(ComShopGoodsDTO comShopGoodsDTO){ Page page = new Page<>(comShopGoodsDTO.getPageNum(),comShopGoodsDTO.getPageSize()); IPage<ComShopGoodsVO> goodsVOIPage = this.baseMapper.pageShopGoodByApps(page,comShopGoodsDTO); if(!goodsVOIPage.getRecords().isEmpty()){ goodsVOIPage.getRecords().forEach(goodsVo -> { List<ComShopGoodsAttrVO> goodsAttrList = shopGoodsAttrDAO.getGoodsAttr(goodsVo.getId()); if (!goodsAttrList.isEmpty()) { if(!goodsAttrList.isEmpty()){ goodsVo.setGoodsAttrList(goodsAttrList); } }); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
@@ -1,21 +1,21 @@ package com.panzhihua.service_community.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.constants.Constants; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.shop.*; import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.service_community.dao.ComShopGoodsAttrDAO; import com.panzhihua.service_community.dao.ComShopGoodsDAO; import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.panzhihua.service_community.dao.ComShopStoreDAO; import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO; import com.panzhihua.service_community.model.dos.ComShopGoodsDO; import com.panzhihua.service_community.model.dos.ComShopStoreDO; import com.panzhihua.service_community.service.ComShopStoreService; import lombok.extern.slf4j.Slf4j; @@ -38,6 +38,8 @@ private ComShopGoodsDAO shopGoodsDAO; @Resource private ComShopGoodsAttrDAO comShopGoodsAttrDAO; @Resource private UserService userService; /** * 查询店铺列表 @@ -171,23 +173,9 @@ public R deleteStore(Long[] id) { LambdaQueryWrapper<ComShopStoreDO> query = new LambdaQueryWrapper<ComShopStoreDO>().in(ComShopStoreDO::getId, id); List<ComShopStoreDO> comShopStoreDO = this.baseMapper.selectList(query); if(!comShopStoreDO.isEmpty()){ for (ComShopStoreDO shopStoreDO:comShopStoreDO) { //判断店铺下是否拥有正常的商品 List<ComShopGoodsDO> shopGoodsList = shopGoodsDAO.selectList(new QueryWrapper<ComShopGoodsDO>() .lambda().eq(ComShopGoodsDO::getStoreId,shopStoreDO.getId()) .eq(ComShopGoodsDO::getDeleteStatus,ComShopGoodsDO.deleteStatus.no) .eq(ComShopGoodsDO::getStatus,ComShopGoodsDO.status.sell)); if(!shopGoodsList.isEmpty()){//如果有正常商品则提示无法删除 return R.fail("店铺下有商品正在出售，无法删除店铺"); } shopStoreDO.setDeleteStatus(2); this.baseMapper.updateById(shopStoreDO); } }else { return R.fail("未查询到店铺"); for (ComShopStoreDO shopStoreDO:comShopStoreDO) { shopStoreDO.setDeleteStatus(2); int update = this.baseMapper.updateById(shopStoreDO); } return R.ok(); } @@ -213,4 +201,23 @@ BeanUtils.copyProperties(comShopStoreDO, shopStoreVO); return R.ok(shopStoreVO); } @Override public R getUserStoreInfo(String account) { try { R<LoginUserInfoVO> loginUserInfoVOR = userService.getUserInfo(account+"_5"); LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(loginUserInfoVOR.getData()), LoginUserInfoVO.class); ComShopStoreDO comShopStoreDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ComShopStoreDO>() .eq(ComShopStoreDO::getDeleteStatus, 1).eq(ComShopStoreDO::getSysUserId, loginUserInfoVO.getUserId())); if (comShopStoreDO == null) { R.fail(500, "商铺不存在"); } ShopStoreVO shopStoreVO = new ShopStoreVO(); BeanUtils.copyProperties(comShopStoreDO, shopStoreVO); return R.ok(shopStoreVO); }catch (Exception e){ return R.fail(); } } } springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/LoginApi.java
@@ -46,8 +46,23 @@ return R.fail("账户密码不能为空"); } log.info("登录用户信息【{}】",loginBody); R r = tokenService.loginShopBackStage(account,password); return r; try { R<ShopStoreVO> storeR = communityService.getUserStoreInfoByAccount(account); if(R.isOk(storeR)) { ShopStoreVO shopStoreVO = JSONObject.parseObject(JSONObject.toJSONString(storeR.getData()), ShopStoreVO.class); Boolean accountValid = shopStoreVO.getStatus() == 1; if (accountValid) { R r = tokenService.loginShopBackStage(account, password); return r; } else { return R.fail("商家状态异常，无法登陆"); } } return R.fail("商家不存在"); }catch (Exception e){ return R.fail(); } } @ApiOperation(value = "修改密码") @@ -73,9 +88,7 @@ try { LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(loginUserInfoVOR.getData()), LoginUserInfoVO.class); loginUserInfoVO.setPassword("******"); R<ShopStoreVO> storeR = communityService.getUserStoreInfo(userId); LoginStoreUserInfoVO loginStoreUserInfoVO = new LoginStoreUserInfoVO(); BeanUtils.copyProperties(loginUserInfoVO, loginStoreUserInfoVO); if (R.isOk(storeR)&& storeR.getData()!=null) {
