Merge branch 'dev' into 'master'

Dev

See merge request !2

common/src/main/java/com/onsiteservice/common/order/dto/SendServiceOrderDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Positive;
 import java.math.BigDecimal;
 
 /**
@@ -24,8 +25,8 @@ public class SendServiceOrderDTO {
     private Long id;
 
     @ApiModelProperty(value = "订单价格,维修价格不能低于1元", required = true)
-    @Min(value = 0, message = "维修价格不能低于1元")
     @NotNull(message = "请输入维修价格")
+    @Positive(message = "价格必须为正数")
     private BigDecimal price;
 
 }

common/src/main/java/com/onsiteservice/common/service/CommonSmsService.java

 package com.onsiteservice.common.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.onsiteservice.common.redis.RedisUtils;
 import com.onsiteservice.util.aliyun.SmsUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -9,6 +10,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Map;
 
 /**
  * 业务短信服务
@@ -67,39 +69,39 @@ public class CommonSmsService {
             return;
         }
         try {
-            smsUtils.send(sign, changePhoneTmpCode, code, phone);
+            smsUtils.send(sign, changePhoneTmpCode, JSONObject.toJSONString(Map.of("code", code)), phone);
         } catch (Exception e) {
             log.error("发送短信错误", e);
         }
     }
 
-    public void payable(String phone) {
+    public void payable(String phone, String servicePhone, String serviceName) {
         if (StringUtils.isEmpty(phone)) {
             return;
         }
         try {
-            smsUtils.send(sign, payableTmpCode, null, phone);
+            smsUtils.send(sign, payableTmpCode, JSONObject.toJSONString(Map.of("phone", servicePhone, "name", serviceName)), phone);
         } catch (Exception e) {
             log.error("发送短信错误", e);
         }
     }
 
-    public void dispatched(String phone) {
+    public void dispatched(String phone, String servicePhone, String serviceName) {
         if (StringUtils.isEmpty(phone)) {
             return;
         }
         try {
-            smsUtils.send(sign, dispatchedTmpCode, null, phone);
+            smsUtils.send(sign, dispatchedTmpCode, JSONObject.toJSONString(Map.of("phone", servicePhone, "name", serviceName)), phone);
         } catch (Exception e) {
             log.error("发送短信错误", e);
         }
     }
-    public void redispatched(String phone) {
+    public void redispatched(String phone, String servicePhone, String serviceName) {
         if (StringUtils.isEmpty(phone)) {
             return;
         }
         try {
-            smsUtils.send(sign, redispatchedTmpCode, null, phone);
+            smsUtils.send(sign, redispatchedTmpCode, JSONObject.toJSONString(Map.of("phone", servicePhone, "name", serviceName)), phone);
         } catch (Exception e) {
             log.error("发送短信错误", e);
         }
@@ -116,23 +118,23 @@ public class CommonSmsService {
         }
     }
 
-    public void valuator(String phone) {
+    public void valuator(String phone, String servicePhone, String serviceName) {
         if (StringUtils.isEmpty(phone)) {
             return;
         }
         try {
-            smsUtils.send(sign, valuatorTmpCode, null, phone);
+            smsUtils.send(sign, valuatorTmpCode, JSONObject.toJSONString(Map.of("phone", servicePhone, "name", serviceName)), phone);
         } catch (Exception e) {
             log.error("发送短信错误", e);
         }
     }
 
-    public void revaluator(String phone) {
+    public void revaluator(String phone, String servicePhone, String serviceName) {
         if (StringUtils.isEmpty(phone)) {
             return;
         }
         try {
-            smsUtils.send(sign, revaluatorTmpCode, null, phone);
+            smsUtils.send(sign, revaluatorTmpCode, JSONObject.toJSONString(Map.of("phone", servicePhone, "name", serviceName)), phone);
         } catch (Exception e) {
             log.error("发送短信错误", e);
         }

common/src/main/java/com/onsiteservice/service/order/ServiceOrderService.java

@@ -108,7 +108,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
             // 记录估价员指派时间
             serviceValuatorAssignMapper.insertSelective(buildServiceValuatorAssign(dto, userId));
             // 通知用户
-            commonSmsService.valuator(serviceOrder.getPhone());
+            commonSmsService.valuator(serviceOrder.getPhone(), user.getPhone(), serviceOrder.getServiceName());
 
             String description = String.format(ServiceOrderStatusEnum.VALUATION.getMsg(), user.getName(), valuatorUser.getUserName());
             recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.VALUATION.getStatus(), description,
@@ -143,7 +143,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
             // 设置新的估计员世间
             serviceValuatorAssignMapper.insertSelective(buildServiceValuatorAssign(dto, userId));
             // 通知用户
-            commonSmsService.revaluator(serviceOrder.getPhone());
+            commonSmsService.revaluator(serviceOrder.getPhone(), user.getPhone(), serviceOrder.getServiceName());
             String description = String.format(ServiceOrderStatusEnum.REVALUATION.getMsg(), user.getName(), valuatorUser.getUserName());
             recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.REVALUATION.getStatus(), description,
                     sourceEnum, valuatorUser.getId(), dto.getRemark(), dto.getExpectArrivalTime());
@@ -184,7 +184,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
         try {
             // 发短信
             log.info("sendOrder send msg to phone: {}", serviceOrder.getPhone());
-            commonSmsService.payable(serviceOrder.getPhone());
+            commonSmsService.payable(serviceOrder.getPhone(), user.getPhone(), serviceOrder.getServiceName());
         } catch (Exception e) {
             log.error("sendOrder error, ", e);
         }
@@ -226,7 +226,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
         serviceOrder.setModifyBy(userId);
         int result = serviceOrderMapper.updateByConditionSelective(serviceOrder, c);
 
-        commonSmsService.dispatched(serviceOrder.getPhone());
+        commonSmsService.dispatched(serviceOrder.getPhone(), user.getPhone(), serviceOrder.getServiceName());
 
         if (result == 1) {
             // 记录维修工时间
@@ -263,7 +263,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
 
         int result = serviceWorkerAssignMapper.insertSelective(buildServiceWorkerAssign(dto, serviceOrder, userId));
 
-        commonSmsService.redispatched(serviceOrder.getPhone());
+        commonSmsService.redispatched(serviceOrder.getPhone(), user.getPhone(), serviceOrder.getServiceName());
 
         if (result == 1) {
             String description = String.format(ServiceOrderStatusEnum.REDISPATCH.getMsg(), user.getName(), serviceWorker.getName());
@@ -293,10 +293,10 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
             if (!isUser && !isAdmin) {
                 throw new ServiceException(BizCodeEnum.NO_AUTH_FINISH_ORDER);
             }
-            user = new WorkUser(miniUser.getId(), miniUser.getUserName(), isAdmin);
+            user = new WorkUser(miniUser.getId(), miniUser.getUserName(), isAdmin, miniUser.getPhone());
         } else {
             var sysUser = sysUserMapper.selectByPrimaryKey(userId);
-            user = new WorkUser(sysUser.getId(), sysUser.getRealName(), true);
+            user = new WorkUser(sysUser.getId(), sysUser.getRealName(), true, sysUser.getPhone());
         }
 
         Condition c = buildOrderStatusCondition(serviceOrder);
@@ -343,13 +343,13 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
                 throw new ServiceException(biz);
             }
 
-            return new WorkUser(user.getId(), user.getUserName(), user.getRoleType().equals(ServiceUserTypeEnum.ADMIN.getId()));
+            return new WorkUser(user.getId(), user.getUserName(), user.getRoleType().equals(ServiceUserTypeEnum.ADMIN.getId()), user.getPhone());
         }
         SysUser sysUser = sysUserMapper.selectByPrimaryKey(userId);
         if (Objects.isNull(sysUser)) {
             throw new ServiceException(biz);
         }
-        return new WorkUser(sysUser.getId(), sysUser.getRealName(), true);
+        return new WorkUser(sysUser.getId(), sysUser.getRealName(), true, sysUser.getPhone());
     }
 
 

common/src/main/java/com/onsiteservice/service/order/WorkUser.java

@@ -12,4 +12,6 @@ public class WorkUser {
     private String name;
     // 是否是客服
     private Boolean isAdmin;
+
+    private String phone;
 }

mini-app/src/main/java/com/onsiteservice/miniapp/controller/address/ServiceAddressController.java

@@ -74,7 +74,7 @@ public class ServiceAddressController {
     @ApiOperation(value = "根据id删除服务地址")
     @DeleteMapping("delete/{id}")
     public Result deleteById(@ApiParam(name = "id", value = "服务地址id") @PathVariable @Positive Long id, @CurrentUserId Long userId) {
-        return serviceAddressService.delete(id, userId) == 1 ? success() : fail("删除失败");
+        return serviceAddressService.delete(id, userId) == 1 ? success("删除成功") : fail("删除失败");
     }
 
 }

mini-app/src/main/java/com/onsiteservice/miniapp/controller/address/dto/SaveServiceAddressDTO.java

@@ -4,9 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import javax.validation.constraints.*;
 
 @Data
 @ApiModel("保存服务地址请求模型")
@@ -17,6 +15,7 @@ public class SaveServiceAddressDTO {
      */
     @ApiModelProperty(value = "姓名", required = true)
     @NotBlank(message = "请输入联系人")
+    @Size(max = 18, message = "姓名不能长于18个字符")
     private String name;
 
     /**
@@ -46,6 +45,7 @@ public class SaveServiceAddressDTO {
      */
     @ApiModelProperty(value = "地址", required = true)
     @NotBlank(message = "请输入详细地址")
+    @Size(max = 72, message = "地址不能长于72个字符")
     private String address;
 
 //    @ApiModelProperty(value = "是否默认收货地址", required = true)

mini-app/src/main/java/com/onsiteservice/miniapp/controller/address/dto/UpdateServiceAddressDTO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 
 @Data
 @ApiModel("修改服务地址请求模型")
@@ -21,6 +22,7 @@ public class UpdateServiceAddressDTO {
      */
     @ApiModelProperty(value = "姓名", required = true)
     @NotBlank(message = "请输入联系人")
+    @Size(max = 18, message = "姓名不能长于18个字符")
     private String name;
 
     /**
@@ -50,6 +52,7 @@ public class UpdateServiceAddressDTO {
      */
     @ApiModelProperty(value = "地址", required = true)
     @NotBlank(message = "请输入详细地址")
+    @Size(max = 72, message = "地址不能长于72个字符")
     private String address;
 
 //    @ApiModelProperty(value = "是否默认收货地址", required = true)