diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserReviewInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserReviewInfoServiceImpl.java index cba219c..72f473d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserReviewInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserReviewInfoServiceImpl.java @@ -17,6 +17,7 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkUserReviewStateEditVo; import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService; import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService; import com.starry.admin.modules.clerk.service.IPlayClerkUserReviewInfoService; +import com.starry.admin.modules.order.module.constant.OrderConstant; import com.starry.admin.modules.weichat.service.WxCustomMpService; import com.starry.common.utils.IdUtils; import java.util.Arrays; @@ -172,8 +173,8 @@ public class PlayClerkUserReviewInfoServiceImpl userInfo.setClerkState("1"); userInfo.setId(entity.getClerkId()); userInfo.setAlbum(entity.getAlbum()); - if(entity.getSex().equals("0")){ - userInfo.setSex("2"); + if(OrderConstant.Gender.UNKNOWN.getCode().equals(entity.getSex())){ + userInfo.setSex(OrderConstant.Gender.FEMALE.getCode()); } playClerkUserInfoService.update(userInfo); clerkCommodityService.initClerkCommodity(userInfo.getId()); diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/constant/OrderConstant.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/constant/OrderConstant.java index f14b181..c2a9bb9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/constant/OrderConstant.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/constant/OrderConstant.java @@ -180,6 +180,37 @@ public class OrderConstant { } } + /** + * 操作人类型枚举 + */ + @Getter + public enum OperatorType { + CUSTOMER("0", "顾客"), + CLERK("1", "店员"), + ADMIN("2", "管理员"); + + private final String code; + private final String description; + + OperatorType(String code, String description) { + this.code = code; + this.description = description; + } + + public static OperatorType fromCode(String code) { + for (OperatorType type : values()) { + if (type.code.equals(code)) { + return type; + } + } + throw new IllegalArgumentException("Unknown operator type code: " + code); + } + } + + // 排除历史记录常量 + public static final String EXCLUDE_HISTORY_NO = "0"; + public static final String EXCLUDE_HISTORY_YES = "1"; + // Legacy constants for backward compatibility - consider deprecating @Deprecated public final static String ORDER_STATUS_0 = "0"; diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderDetailsReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderDetailsReturnVo.java index d6b03ea..b81e3fa 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderDetailsReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderDetailsReturnVo.java @@ -126,6 +126,11 @@ public class PlayOrderDetailsReturnVo { */ private String placeType; + /** + * 要求店员性别(0:未知;1:男;2:女)- 仅随机单有效 + */ + private String sex; + /** * 微信号码 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java index d17d9bb..d53c9e2 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java @@ -672,7 +672,16 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PlayOrderInfoEntity::getAcceptBy, acceptBy); - if ("1".equals(orderInfo.getExcludeHistory()) && this.baseMapper.selectOne(lambdaQueryWrapper) != null) { + if (OrderConstant.EXCLUDE_HISTORY_YES.equals(orderInfo.getExcludeHistory()) + && this.baseMapper.selectOne(lambdaQueryWrapper) != null) { // throw new CustomException("只有未接单的店员才可接单"); } } @@ -867,7 +879,9 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl