From 741f62554a068edbf8a16c0d4be9a85431094772 Mon Sep 17 00:00:00 2001 From: tangzh Date: Sun, 16 Mar 2025 14:19:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zbkj/admin/controller/UserController.java | 13 ------------ .../java/com/zbkj/common/model/user/User.java | 3 --- .../common/request/UserSearchRequest.java | 3 --- .../common/request/UserUpdateRequest.java | 3 --- .../common/response/UserCenterResponse.java | 3 --- .../zbkj/common/response/UserResponse.java | 2 -- .../front/controller/CouponController.java | 2 +- .../service/StoreOrderVerification.java | 7 ------- .../com/zbkj/service/service/UserService.java | 2 -- .../impl/StoreCouponUserServiceImpl.java | 1 - .../impl/StoreOrderReturnServiceImpl.java | 1 - .../impl/StoreOrderVerificationImpl.java | 14 ------------- .../impl/SystemGroupDataServiceImpl.java | 4 ---- .../service/service/impl/UserServiceImpl.java | 21 ------------------- 14 files changed, 1 insertion(+), 78 deletions(-) diff --git a/food-admin/src/main/java/com/zbkj/admin/controller/UserController.java b/food-admin/src/main/java/com/zbkj/admin/controller/UserController.java index 864d54e..2b17ae9 100644 --- a/food-admin/src/main/java/com/zbkj/admin/controller/UserController.java +++ b/food-admin/src/main/java/com/zbkj/admin/controller/UserController.java @@ -136,19 +136,6 @@ public class UserController { return CommonResult.failed(); } - /** - * @param id String id - */ - @PreAuthorize("hasAuthority('admin:user:update')") - @ApiOperation(value = "批量设置核销员") - @RequestMapping(value = "/batchSetProsecutor", method = RequestMethod.POST) - public CommonResult batchSetProsecutor(@RequestParam String id) { - if (userService.batchSetProsecutor(id)) { - return CommonResult.success(); - } - return CommonResult.failed(); - } - /** * 会员分组 * @param id String id diff --git a/food-common/src/main/java/com/zbkj/common/model/user/User.java b/food-common/src/main/java/com/zbkj/common/model/user/User.java index 93ffab6..6e77f9d 100644 --- a/food-common/src/main/java/com/zbkj/common/model/user/User.java +++ b/food-common/src/main/java/com/zbkj/common/model/user/User.java @@ -149,7 +149,4 @@ public class User implements Serializable { @ApiModelProperty(value = "成为分销员时间") private Date promoterTime; - @ApiModelProperty(value = "是否核销员，0否,1是") - private Integer isProsecutor; - } diff --git a/food-common/src/main/java/com/zbkj/common/request/UserSearchRequest.java b/food-common/src/main/java/com/zbkj/common/request/UserSearchRequest.java index 1bba8db..0ca1de1 100644 --- a/food-common/src/main/java/com/zbkj/common/request/UserSearchRequest.java +++ b/food-common/src/main/java/com/zbkj/common/request/UserSearchRequest.java @@ -8,7 +8,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -71,6 +70,4 @@ public class UserSearchRequest implements Serializable { @ApiModelProperty(value = "性别，0未知，1男，2女，3保密") private String sex; - @ApiModelProperty(value = "是否核销员：0否，1是", allowableValues = "range[0,1]") - private String isProsecutor; } diff --git a/food-common/src/main/java/com/zbkj/common/request/UserUpdateRequest.java b/food-common/src/main/java/com/zbkj/common/request/UserUpdateRequest.java index cd83f71..77c97a1 100644 --- a/food-common/src/main/java/com/zbkj/common/request/UserUpdateRequest.java +++ b/food-common/src/main/java/com/zbkj/common/request/UserUpdateRequest.java @@ -56,7 +56,4 @@ public class UserUpdateRequest implements Serializable { @NotNull(message = "是否为推广员不能为空") private Boolean isPromoter; - @ApiModelProperty(value = "是否核销员，0否,1是") - private Integer isProsecutor; - } diff --git a/food-common/src/main/java/com/zbkj/common/response/UserCenterResponse.java b/food-common/src/main/java/com/zbkj/common/response/UserCenterResponse.java index b37f90e..c8b1187 100644 --- a/food-common/src/main/java/com/zbkj/common/response/UserCenterResponse.java +++ b/food-common/src/main/java/com/zbkj/common/response/UserCenterResponse.java @@ -80,7 +80,4 @@ public class UserCenterResponse implements Serializable { @ApiModelProperty(value = "用户收藏数量") private Integer collectCount; - - @ApiModelProperty(value = "是否核销员，0否,1是") - private Integer isProsecutor; } diff --git a/food-common/src/main/java/com/zbkj/common/response/UserResponse.java b/food-common/src/main/java/com/zbkj/common/response/UserResponse.java index 628c48a..9feff7e 100644 --- a/food-common/src/main/java/com/zbkj/common/response/UserResponse.java +++ b/food-common/src/main/java/com/zbkj/common/response/UserResponse.java @@ -141,6 +141,4 @@ public class UserResponse { @ApiModelProperty(value = "是否关注公众号") private Boolean subscribe; - @ApiModelProperty(value = "是否核销员，0否,1是") - private Integer isProsecutor; } diff --git a/food-front/src/main/java/com/zbkj/front/controller/CouponController.java b/food-front/src/main/java/com/zbkj/front/controller/CouponController.java index dbb3124..463b3e5 100644 --- a/food-front/src/main/java/com/zbkj/front/controller/CouponController.java +++ b/food-front/src/main/java/com/zbkj/front/controller/CouponController.java @@ -59,7 +59,7 @@ public class CouponController { * 根据购物车id获取可用优惠券 */ @ApiOperation(value = "当前订单可用优惠券") - @RequestMapping(value = "coupons/order/{preOrderNo}", method = RequestMethod.GET) + @RequestMapping(value = "/coupons/order/{preOrderNo}", method = RequestMethod.GET) public CommonResult> getCouponsListByPreOrderNo(@PathVariable String preOrderNo) { return CommonResult.success(storeCouponUserService.getListByPreOrderNo(preOrderNo)); } diff --git a/food-service/src/main/java/com/zbkj/service/service/StoreOrderVerification.java b/food-service/src/main/java/com/zbkj/service/service/StoreOrderVerification.java index 51947c9..c25786d 100644 --- a/food-service/src/main/java/com/zbkj/service/service/StoreOrderVerification.java +++ b/food-service/src/main/java/com/zbkj/service/service/StoreOrderVerification.java @@ -39,11 +39,4 @@ public interface StoreOrderVerification { */ StoreOrderVerificationConfirmResponse getVerificationOrderByCode(String vCode); - /** - * 核销员核销码核销订单 - * @param vCode - * @return - */ - boolean prosecutorVerificationOrderByCode(String vCode); - } diff --git a/food-service/src/main/java/com/zbkj/service/service/UserService.java b/food-service/src/main/java/com/zbkj/service/service/UserService.java index 002c4e4..b60dc9c 100644 --- a/food-service/src/main/java/com/zbkj/service/service/UserService.java +++ b/food-service/src/main/java/com/zbkj/service/service/UserService.java @@ -316,6 +316,4 @@ public interface UserService extends IService { */ User getInfoByUid(Integer id); - boolean batchSetProsecutor(String id); - } diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/StoreCouponUserServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/StoreCouponUserServiceImpl.java index 36b5aad..5810312 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/StoreCouponUserServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/StoreCouponUserServiceImpl.java @@ -262,7 +262,6 @@ public class StoreCouponUserServiceImpl extends ServiceImpl storeCouponUserOrderArrayList = new ArrayList<>(); List storeCouponUserList = dao.selectList(lambdaQueryWrapper); if (storeCouponUserList.size() < 1) { diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderReturnServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderReturnServiceImpl.java index 0dc9fd2..911817b 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderReturnServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderReturnServiceImpl.java @@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderVerificationImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderVerificationImpl.java index 6759b8e..2900280 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderVerificationImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderVerificationImpl.java @@ -189,20 +189,6 @@ public class StoreOrderVerificationImpl implements StoreOrderVerification { return verificationOrderByCode(vCode, currentAdmin.getId(), 0); } - /** - * 核销员核销订单 - * @param vCode - * @return - */ - @Override - public boolean prosecutorVerificationOrderByCode(String vCode) { - User currentUser = userService.getInfo(); - if (null == currentUser || currentUser.getIsProsecutor() == 0) { - throw new CrmebException("您不是核销员，无法核销订单"); - } - return verificationOrderByCode(vCode, currentUser.getUid(), 1); - } - /** * 根据核销码查询待核销订单 * diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/SystemGroupDataServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/SystemGroupDataServiceImpl.java index c1fae38..92d643d 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/SystemGroupDataServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/SystemGroupDataServiceImpl.java @@ -217,13 +217,9 @@ public class SystemGroupDataServiceImpl extends ServiceImpl getMenuUser() { - User user = userService.getInfo(); HashMap map = new HashMap<>(); List> routine_my_menus = getListMapByGid(SysGroupDataConstants.GROUP_DATA_ID_USER_CENTER_MENU); List> routine_my_banner = getListMapByGid(SysGroupDataConstants.GROUP_DATA_ID_USER_CENTER_BANNER); - if (null == user || user.getIsProsecutor() == 0) { - routine_my_menus = routine_my_menus.stream().filter(i-> !i.get("name").equals("核销订单")).collect(Collectors.toList()); - } map.put("routine_my_menus", routine_my_menus); map.put("routine_my_banner", routine_my_banner); return map; diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java index 438aee2..29ce07a 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java @@ -150,10 +150,6 @@ public class UserServiceImpl extends ServiceImpl implements UserS map.put("sex", Integer.valueOf(request.getSex())); } - if (StringUtils.isNotBlank(request.getIsProsecutor())) { - map.put("isProsecutor", request.getIsProsecutor()); - } - if (StringUtils.isNotBlank(request.getCountry())) { map.put("country", request.getCountry()); // 根据省市查询 @@ -337,23 +333,6 @@ public class UserServiceImpl extends ServiceImpl implements UserS return update(lambdaUpdateWrapper); } - @Override - public boolean batchSetProsecutor(String id) { - if (StrUtil.isBlank(id)) throw new CrmebException("会员编号不能为空"); - List idList = CrmebUtil.stringToArray(id); - List list = getListInUid(idList); - if (CollUtil.isEmpty(list)) throw new CrmebException("没有找到用户信息"); - List upd = new ArrayList<>(); - for (User user : list) { - Integer isProsecutor = user.getIsProsecutor(); - // 是否核销员：0否，1是 - if (null != isProsecutor && isProsecutor == 1) { continue; } - user.setIsProsecutor(1); - upd.add(user); - } - if (upd.size() == 0) { return true; } - return updateBatchById(upd); - } /** * 会员分组 *