ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java
@@ -114,30 +114,32 @@ @PostMapping(value = "/update") public AjaxResult<String> update(@RequestBody TOrderMealDTO dto) { // 删除所有菜品 orderMealGoodsService.remove(Wrappers.lambdaQuery(TOrderMealGoods.class) .eq(TOrderMealGoods::getOrderId, dto.getId())); orderMealService.updateById(dto); for (TOrderMealGoods mealOrderGood : dto.getMealOrderGoods()) { // 设置商品类型和类型id TGoodsType goodsType = goodsTypeService.getById(mealOrderGood.getTypeId()); mealOrderGood.setId(null); mealOrderGood.setOrderId(dto.getId()); mealOrderGood.setTypeId(goodsType.getId()); mealOrderGood.setTypeName(goodsType.getTypeName()); if(!CollectionUtils.isEmpty(dto.getMealOrderGoods())){ orderMealGoodsService.remove(Wrappers.lambdaQuery(TOrderMealGoods.class) .eq(TOrderMealGoods::getOrderId, dto.getId())); for (TOrderMealGoods mealOrderGood : dto.getMealOrderGoods()) { // 设置商品类型和类型id TGoodsType goodsType = goodsTypeService.getById(mealOrderGood.getTypeId()); mealOrderGood.setId(null); mealOrderGood.setOrderId(dto.getId()); mealOrderGood.setTypeId(goodsType.getId()); mealOrderGood.setTypeName(goodsType.getTypeName()); } orderMealGoodsService.saveBatch(dto.getMealOrderGoods()); } orderMealGoodsService.saveBatch(dto.getMealOrderGoods()); return AjaxResult.success(); } @ApiOperation( value = "列表详情结账") @PostMapping(value = "/detailUpdate") public AjaxResult<String> detailUpdate(@RequestBody TOrderMealDTO dto) { // 删除所有菜品 orderMealGoodsService.remove(Wrappers.lambdaQuery(TOrderMealGoods.class) .eq(TOrderMealGoods::getOrderId, dto.getId())); orderMealService.updateById(dto); // 查询餐桌 List<TOrderMealGoods> mealOrderGoods = dto.getMealOrderGoods(); if (!CollectionUtils.isEmpty(mealOrderGoods)) { // 删除所有菜品 orderMealGoodsService.remove(Wrappers.lambdaQuery(TOrderMealGoods.class) .eq(TOrderMealGoods::getOrderId, dto.getId())); for (TOrderMealGoods mealOrderGood : mealOrderGoods) { // 设置商品类型和类型id mealOrderGood.setId(null); ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -197,7 +197,6 @@ @PostMapping("/edit") public AjaxResult edit(@Validated @RequestBody SysUser user) { user.setUserName(user.getPhonenumber()); // userService.checkUserAllowed(user); // userService.checkUserDataScope(user.getUserId()); if (!userService.checkUserNameUnique(user)) ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -640,7 +640,9 @@ public Long addAccount(TShopDTO dto) { SysUser sysUser = new SysUser(); sysUser.setUserName(dto.getAccount()); sysUser.setPhonenumber(dto.getAccount()); sysUser.setNickName(dto.getShopHead()); sysUser.setObjectId(dto.getId()); if(dto.getShopType().equals(1)){ sysUser.setRoleType(2); sysUser.setRoleId(9L); ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java
@@ -148,7 +148,7 @@ } } BigDecimal sumMoney = orderMeals.stream().map(TOrderMeal::getPayMoney).reduce(BigDecimal::add).get(); if(sumMoney.compareTo(dto.getMinMoney()) >= 0 || sumMoney.compareTo(dto.getMaxMoney()) <= 0){ if(sumMoney.compareTo(dto.getMinMoney()) <= 0 || sumMoney.compareTo(dto.getMaxMoney()) >= 0){ int weiXin = getRandomPayType(orderMeals.size(), dto.getWeiXinProportion()); int ali = getRandomPayType(orderMeals.size(), dto.getAliProportion()); int card = getRandomPayType(orderMeals.size(), dto.getCardProportion()); ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -268,6 +268,7 @@ <if test="createBy != null and createBy != ''">create_by,</if> <if test="remark != null and remark != ''">remark,</if> <if test="roleType != null and roleType != ''">roleType,</if> <if test="objectId != null and objectId != ''">objectId,</if> create_time )values( <if test="userId != null and userId != ''">#{userId},</if> @@ -285,6 +286,7 @@ <if test="createBy != null and createBy != ''">#{createBy},</if> <if test="remark != null and remark != ''">#{remark},</if> <if test="roleType != null and roleType != ''">#{roleType},</if> <if test="objectId != null and objectId != ''">#{objectId},</if> sysdate() ) </insert>
