Merge branch 'feature/v1' into dev/shenliang

ruoyi-api/yingpaipay-api-order/src/main/java/org/dromara/order/api/enums/OrderLogFulfillerStepEnum.java

@@ -8,7 +8,7 @@ import lombok.Getter;
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public enum OrderLogFulfillerStepEnum {
 
-    REJECT(-1, "已拒绝", "履约者 %s 已确认接单，准备前往服务地点"),
+    REJECT(-1, "已拒绝", "履约者 %s 拒绝接单，订单已取消"),
     RECIEVED(0, "已接单", "履约者 %s 已确认接单，准备前往服务地点"),
     COMPLETED(99, "订单完成", "用户/商家已确认，服务圆满结束"),
     ;

ruoyi-modules/yingpaipay-fulfiller/src/main/java/org/dromara/fulfiller/service/impl/FlfFulfillerServiceImpl.java

@@ -151,6 +151,12 @@ public class FlfFulfillerServiceImpl implements IFlfFulfillerService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(FlfFulfillerBo bo) {
+
+        boolean exists = baseMapper.exists(Wrappers.lambdaQuery(FlfFulfiller.class).eq(FlfFulfiller::getPhone, bo.getPhone()));
+        if (exists) {
+            throw new ServiceException("手机号 " + bo.getPhone() + " 已存在");
+        }
+
         // 创建 flf_fulfiller 记录（不再创建 sys_user） @author steelwei
         // 密码需要BCrypt加密
         String encryptedPwd = StringUtils.isNotBlank(bo.getPassword())