From f01b84d9a903ac84232d3bf7e951d2e8e326792d Mon Sep 17 00:00:00 2001 From: zengtao01 Date: Tue, 9 Apr 2024 16:39:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/card/CardController.java | 38 ++-------------- .../app/card/AppCardController.java | 44 ++++++++++++++++++- .../AppStoreComplainController.java | 2 - .../vo/AppStoreComplainSaveReqVO.java | 2 +- .../app/user/AppMemberUserController.java | 9 +++- .../app/user/vo/AppMemberUserInfoRespVO.java | 4 ++ .../storecomplain/StoreComplainDO.java | 2 +- .../storecomplain/StoreComplainMapper.java | 2 +- .../diningplates/DiningPlatesService.java | 2 + .../diningplates/DiningPlatesServiceImpl.java | 11 +++++ .../orderdetail/OrderDetailServiceImpl.java | 14 +++++- .../service/userexpand/UserExpandService.java | 1 + .../userexpand/UserExpandServiceImpl.java | 8 ++++ 13 files changed, 95 insertions(+), 44 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/card/CardController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/card/CardController.java index 95332490..3de32e2b 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/card/CardController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/card/CardController.java @@ -6,13 +6,14 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.member.controller.admin.card.vo.*; +import cn.iocoder.yudao.module.member.controller.admin.card.vo.CardPageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.card.vo.CardRespVO; +import cn.iocoder.yudao.module.member.controller.admin.card.vo.CardSaveReqVO; import cn.iocoder.yudao.module.member.dal.dataobject.card.CardDO; import cn.iocoder.yudao.module.member.service.card.CardService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; @@ -40,39 +41,6 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E @Validated public class CardController { - // 写一个示例，将一条数据插入redis - @Resource - private RedisTemplate redisTemplate; - - @PostMapping("/weighingAddInfo") - @Operation(summary = "称重信息入口") - public void weighingAddInfo(@RequestBody RobotReqVO reqVO) { -// 生成一个redis对象并且插入数据 - redisTemplate.opsForValue().set(reqVO.getIp(), reqVO); - } - - @GetMapping("/weighingGetInfo") - @Operation(summary = "获取称重相关信息") - public CommonResult weighingGetInfo(@RequestParam String ip) { -// 生成一个redis对象并且插入数据 -// redisTemplate.opsForValue().get(ip); - return success(redisTemplate.opsForValue().get(ip)); - } - - @GetMapping("/plateGetInfo") - @Operation(summary = "获取盘子信息") - public CommonResult plateGetInfo(@RequestParam String ip) { -// 生成一个redis对象并且插入数据 - return success(redisTemplate.opsForValue().get(ip)); - } - - @PostMapping("/plateAddInfo") - @Operation(summary = "盘子信息入口") - public void plateAddInfo(@RequestBody RobotReqVO reqVO) { -// 生成一个redis对象并且插入数据 - redisTemplate.opsForValue().set(reqVO.getIp(), reqVO); - } - @Resource private CardService cardService; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/card/AppCardController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/card/AppCardController.java index a9ffaaf3..5b618abf 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/card/AppCardController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/card/AppCardController.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.member.controller.admin.card.vo.CardRespVO; +import cn.iocoder.yudao.module.member.controller.admin.card.vo.RobotReqVO; import cn.iocoder.yudao.module.member.controller.app.card.vo.AppCardMonthVO; import cn.iocoder.yudao.module.member.controller.app.card.vo.AppCardPageReqVO; import cn.iocoder.yudao.module.member.dal.dataobject.card.CardDO; @@ -11,15 +12,20 @@ import cn.iocoder.yudao.module.member.service.card.CardService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; import java.math.BigDecimal; +import java.math.RoundingMode; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -32,6 +38,10 @@ public class AppCardController { @Resource private CardService cardService; + // 写一个示例，将一条数据插入redis + @Resource + private RedisTemplate redisTemplate; + //@PostMapping("/create") //@Operation(summary = "创建余额变动明细") //@PreAuthorize("@ss.hasPermission('member:card:create')") @@ -90,7 +100,9 @@ public class AppCardController { @Operation(summary = "充值") //@PreAuthorize("@ss.hasPermission('member:card:update')") public CommonResult recharge(BigDecimal money) { - return success(cardService.recharge(money.divide(new BigDecimal("100")), CardDO.ADD)); + BigDecimal bigDecimal = money.divide(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP); + return success(cardService.recharge(bigDecimal,CardDO.ADD)); + } @GetMapping("/getMoney") @@ -107,4 +119,34 @@ public class AppCardController { } + + @PostMapping("/weighingAddInfo") + @Operation(summary = "称重信息入口") + public void weighingAddInfo(@RequestBody RobotReqVO reqVO) { +// 生成一个redis对象并且插入数据 + redisTemplate.opsForValue().set(reqVO.getIp(), reqVO); + } + + @GetMapping("/weighingGetInfo") + @Operation(summary = "获取称重相关信息") + public CommonResult weighingGetInfo(@RequestParam String ip) { +// 生成一个redis对象并且插入数据 +// redisTemplate.opsForValue().get(ip); + return success(redisTemplate.opsForValue().get(ip)); + } + + @GetMapping("/plateGetInfo") + @Operation(summary = "获取盘子信息") + public CommonResult plateGetInfo(@RequestParam String ip) { +// 生成一个redis对象并且插入数据 + return success(redisTemplate.opsForValue().get(ip)); + } + + @PostMapping("/plateAddInfo") + @Operation(summary = "盘子信息入口") + public void plateAddInfo(@RequestBody RobotReqVO reqVO) { +// 生成一个redis对象并且插入数据 + redisTemplate.opsForValue().set(reqVO.getIp(), reqVO); + } + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storecomplain/AppStoreComplainController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storecomplain/AppStoreComplainController.java index 0358d246..fa4f244d 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storecomplain/AppStoreComplainController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storecomplain/AppStoreComplainController.java @@ -5,7 +5,6 @@ import cn.iocoder.yudao.module.member.controller.app.storecomplain.vo.AppStoreCo import cn.iocoder.yudao.module.member.service.storecomplain.StoreComplainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -28,7 +27,6 @@ public class AppStoreComplainController { @PostMapping("/create") @Operation(summary = "创建投诉") - @PreAuthorize("@ss.hasPermission('member:store-complain:create')") public CommonResult createStoreComplain(@Valid @RequestBody AppStoreComplainSaveReqVO createReqVO) { return success(storeComplainService.createStoreComplainApp(createReqVO)); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storecomplain/vo/AppStoreComplainSaveReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storecomplain/vo/AppStoreComplainSaveReqVO.java index 7843c46e..60fb018c 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storecomplain/vo/AppStoreComplainSaveReqVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storecomplain/vo/AppStoreComplainSaveReqVO.java @@ -23,7 +23,7 @@ public class AppStoreComplainSaveReqVO { private String topic; @Schema(description = "描述") - private String describe; + private String des; @Schema(description = "上传照片") private String url; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java index f2f93af7..6059c456 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java @@ -14,8 +14,10 @@ import cn.iocoder.yudao.module.member.controller.app.user.vo.AppWeekVO; import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; +import cn.iocoder.yudao.module.member.dal.dataobject.userexpand.UserExpandDO; import cn.iocoder.yudao.module.member.service.level.MemberLevelService; import cn.iocoder.yudao.module.member.service.user.MemberUserService; +import cn.iocoder.yudao.module.member.service.userexpand.UserExpandService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; @@ -48,6 +50,8 @@ public class AppMemberUserController { private MemberUserService userService; @Resource private MemberLevelService levelService; + @Resource + private UserExpandService userExpandService; @GetMapping("/get") @Operation(summary = "获得基本信息") @@ -55,7 +59,10 @@ public class AppMemberUserController { public CommonResult getUserInfo() { MemberUserDO user = userService.getUser(getLoginUserId()); MemberLevelDO level = levelService.getLevel(user.getLevelId()); - return success(MemberUserConvert.INSTANCE.convert(user, level)); + UserExpandDO userExpandByuserId = userExpandService.getUserExpandByuserId(getLoginUserId()); + AppMemberUserInfoRespVO convert = MemberUserConvert.INSTANCE.convert(user, level); + convert.setUserExpandDO(userExpandByuserId); + return success(convert); } @PutMapping("/update") diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java index fa05e16d..a0ca562f 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.member.controller.app.user.vo; +import cn.iocoder.yudao.module.member.dal.dataobject.userexpand.UserExpandDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; @@ -35,6 +36,9 @@ public class AppMemberUserInfoRespVO { @Schema(description = "是否成为推广员", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") private Boolean brokerageEnabled; + @Schema(description = "延伸", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") + private UserExpandDO userExpandDO; + @Schema(description = "用户 App - 会员等级") @Data public static class Level { diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storecomplain/StoreComplainDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storecomplain/StoreComplainDO.java index cbd52794..e283f9e0 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storecomplain/StoreComplainDO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storecomplain/StoreComplainDO.java @@ -50,7 +50,7 @@ public class StoreComplainDO extends BaseDO { /** * 描述 */ - private String describe; + private String des; /** * 上传照片 */ diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/storecomplain/StoreComplainMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/storecomplain/StoreComplainMapper.java index 72b27e07..ead2e505 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/storecomplain/StoreComplainMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/storecomplain/StoreComplainMapper.java @@ -21,7 +21,7 @@ public interface StoreComplainMapper extends BaseMapperX { .eqIfPresent(StoreComplainDO::getStoreId, reqVO.getStoreId()) .likeIfPresent(StoreComplainDO::getStoreName, reqVO.getStoreName()) .eqIfPresent(StoreComplainDO::getTopic, reqVO.getTopic()) - .eqIfPresent(StoreComplainDO::getDescribe, reqVO.getDescribe()) + .eqIfPresent(StoreComplainDO::getDes, reqVO.getDescribe()) .eqIfPresent(StoreComplainDO::getUrl, reqVO.getUrl()) .eqIfPresent(StoreComplainDO::getPhone, reqVO.getPhone()) .betweenIfPresent(StoreComplainDO::getCreateTime, reqVO.getCreateTime()) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesService.java index 7d332b9b..bee80bbd 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesService.java @@ -83,4 +83,6 @@ public interface DiningPlatesService { Boolean bind(String diningPlatesNum,String cardId); Boolean bindByFace(String diningPlatesNum,Long faceId); + + Boolean checkBind(String diningPlatesNum); } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java index 18e03f73..a181cd22 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java @@ -180,4 +180,15 @@ public class DiningPlatesServiceImpl implements DiningPlatesService { stringRedisTemplate.opsForValue().set(diningPlatesNum,"0"); return i>0; } + + @Override + public Boolean checkBind(String diningPlatesNum) { + DiningPlatesDO diningPlatesDO = diningPlatesMapper.selectOne(Wrappers.lambdaQuery() + .eq(DiningPlatesDO::getDiningPlatesNum, diningPlatesNum) + .last("limit 1")); + if(diningPlatesDO==null || diningPlatesDO.getUserId()==null){ + return false; + } + return true; + } } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java index a4cf0b39..55f62882 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java @@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.member.dal.dataobject.order.DishOrderDO; import cn.iocoder.yudao.module.member.dal.dataobject.orderdetail.OrderDetailDO; import cn.iocoder.yudao.module.member.dal.mysql.order.DishOrderMapper; import cn.iocoder.yudao.module.member.dal.mysql.orderdetail.OrderDetailMapper; +import cn.iocoder.yudao.module.member.service.diningplates.DiningPlatesService; import cn.iocoder.yudao.module.system.api.carteen.CarteenApi; import cn.iocoder.yudao.module.system.api.carteen.dto.CarteenRespDto; import cn.iocoder.yudao.module.system.api.dish.DishesApi; @@ -55,14 +56,20 @@ public class OrderDetailServiceImpl implements OrderDetailService { @Resource private DishesApi dishesApi; + @Resource + private DiningPlatesService diningPlatesService; + @Resource private StringRedisTemplate stringRedisTemplate; @Override @Transactional(rollbackFor = Exception.class) public Long createOrderDetail(AppOrderDetailSaveReqVO createReqVO) { - DishesRespDto dish = dishesApi.getDish(createReqVO.getDishesId()); - DishesNutritionRespDTO dishEnergy = dishesNutritionApi.getDishEnergy(createReqVO.getDishesId()); + //判定餐盘是否绑定 + Boolean b = diningPlatesService.checkBind(createReqVO.getDiningPlatesNum()); + if(!b){ + throw new ServiceException(20001,"餐盘未绑定"); + } //餐盘号去获取订单 DishOrderDO dishOrderDO = dishOrderMapper.selectOne(Wrappers.lambdaQuery().eq(DishOrderDO::getDiningPlatesNum, createReqVO.getDiningPlatesNum()) .eq(DishOrderDO::getOrderStatus, DishOrderDO.INCOMPLETE) @@ -72,6 +79,9 @@ public class OrderDetailServiceImpl implements OrderDetailService { throw new ServiceException(20002,"该餐盘订单已完成，请重新绑定餐盘"); } + DishesRespDto dish = dishesApi.getDish(createReqVO.getDishesId()); + DishesNutritionRespDTO dishEnergy = dishesNutritionApi.getDishEnergy(createReqVO.getDishesId()); + // 插入数据 OrderDetailDO orderDetail = BeanUtils.toBean(createReqVO, OrderDetailDO.class); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/userexpand/UserExpandService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/userexpand/UserExpandService.java index 85c2b388..7b5971e8 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/userexpand/UserExpandService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/userexpand/UserExpandService.java @@ -55,4 +55,5 @@ public interface UserExpandService { void updateUserExpandByuserId(Long userId, AppMemberUserUpdateReqVO reqVO); + UserExpandDO getUserExpandByuserId(Long userId); } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/userexpand/UserExpandServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/userexpand/UserExpandServiceImpl.java index cb41d2f2..747496fc 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/userexpand/UserExpandServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/userexpand/UserExpandServiceImpl.java @@ -86,4 +86,12 @@ public class UserExpandServiceImpl implements UserExpandService { userExpandMapper.updateById(userExpandDO); } } + + @Override + public UserExpandDO getUserExpandByuserId(Long userId) { + UserExpandDO userExpandDO = userExpandMapper.selectOne(Wrappers.lambdaQuery() + .eq(UserExpandDO::getUserId, userId) + .last("limit 1")); + return userExpandDO; + } } \ No newline at end of file