zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对接优化

Browse Source
This commit is contained in:
zengtao01
2024-04-09 16:39:44 +08:00
parent 962d8dc3aa
commit f01b84d9a9
13 changed files with 95 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/card/CardController.java
View File

@ -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<String, Object> redisTemplate;
@PostMapping("/weighingAddInfo")
@Operation(summary = "称重信息入口")
public void weighingAddInfo(@RequestBody RobotReqVO reqVO) {
// 生成一个redis对象并且插入数据
redisTemplate.opsForValue().set(reqVO.getIp(), reqVO);
}
@GetMapping("/weighingGetInfo")
@Operation(summary = "获取称重相关信息")
public CommonResult<Object> weighingGetInfo(@RequestParam String ip) {
// 生成一个redis对象并且插入数据
// redisTemplate.opsForValue().get(ip);
return success(redisTemplate.opsForValue().get(ip));
}
@GetMapping("/plateGetInfo")
@Operation(summary = "获取盘子信息")
public CommonResult<Object> 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;

44
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/card/AppCardController.java
View File

@ -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<String, Object> 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<Boolean> 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<Object> weighingGetInfo(@RequestParam String ip) {
// 生成一个redis对象并且插入数据
// redisTemplate.opsForValue().get(ip);
return success(redisTemplate.opsForValue().get(ip));
}
@GetMapping("/plateGetInfo")
@Operation(summary = "获取盘子信息")
public CommonResult<Object> 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);
}
}

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storecomplain/AppStoreComplainController.java
View File

@ -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<Long> createStoreComplain(@Valid @RequestBody AppStoreComplainSaveReqVO createReqVO) {
return success(storeComplainService.createStoreComplainApp(createReqVO));
}

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storecomplain/vo/AppStoreComplainSaveReqVO.java
View File

@ -23,7 +23,7 @@ public class AppStoreComplainSaveReqVO {
private String topic;
@Schema(description = "描述")
private String describe;
private String des;
@Schema(description = "上传照片")
private String url;

9
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java
View File

@ -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<AppMemberUserInfoRespVO> 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")

4
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java
View File

@ -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 {

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storecomplain/StoreComplainDO.java
View File

@ -50,7 +50,7 @@ public class StoreComplainDO extends BaseDO {
/**
* 描述
*/
private String describe;
private String des;
/**
* 上传照片
*/

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/storecomplain/StoreComplainMapper.java
View File

@ -21,7 +21,7 @@ public interface StoreComplainMapper extends BaseMapperX<StoreComplainDO> {
.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())

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesService.java
View File

@ -83,4 +83,6 @@ public interface DiningPlatesService {
Boolean bind(String diningPlatesNum,String cardId);
Boolean bindByFace(String diningPlatesNum,Long faceId);
Boolean checkBind(String diningPlatesNum);
}

11
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java
View File

@ -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.<DiningPlatesDO>lambdaQuery()
.eq(DiningPlatesDO::getDiningPlatesNum, diningPlatesNum)
.last("limit 1"));
if(diningPlatesDO==null || diningPlatesDO.getUserId()==null){
return false;
}
return true;
}
}

14
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java
View File

@ -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.<DishOrderDO>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);

1
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/userexpand/UserExpandService.java
View File

@ -55,4 +55,5 @@ public interface UserExpandService {
void updateUserExpandByuserId(Long userId, AppMemberUserUpdateReqVO reqVO);
UserExpandDO getUserExpandByuserId(Long userId);
}

8
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/userexpand/UserExpandServiceImpl.java
View File

@ -86,4 +86,12 @@ public class UserExpandServiceImpl implements UserExpandService {
userExpandMapper.updateById(userExpandDO);
}
}
@Override
public UserExpandDO getUserExpandByuserId(Long userId) {
UserExpandDO userExpandDO = userExpandMapper.selectOne(Wrappers.<UserExpandDO>lambdaQuery()
.eq(UserExpandDO::getUserId, userId)
.last("limit 1"));
return userExpandDO;
}
}