feat: orderStatusValue返回值

entity/src/main/java/com/onsiteservice/entity/address/ServiceAddress.java

@@ -78,12 +78,5 @@ public class ServiceAddress implements Serializable {
     @ApiModelProperty("创建时间")
     private Date createTime;
 
-    /**
-     * 修改时间
-     */
-    @Column(name = "modify_time")
-    @ApiModelProperty("修改时间")
-    private Date modifyTime;
-
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

@@ -53,6 +53,12 @@ public class ServiceAddressController {
         return success(serviceAddressService.selectById(id, userId));
     }
 
+    @ApiOperation(value = "设置默认地址")
+    @PostMapping("def-address/{id}")
+    public Result defaultAddress(@ApiParam(name = "id", value = "服务地址id") @PathVariable @Positive Long id, @CurrentUserId Long userId) {
+        return serviceAddressService.defaultAddress(id, userId) == 1 ? success() : fail("设置默认地址失败");
+    }
+
     @ApiOperation(value = "新增服务地址")
     @PostMapping("save")
     public Result save(@RequestBody @NonNull @Validated SaveServiceAddressDTO dto, @CurrentUserId Long userId) {

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

@@ -48,8 +48,8 @@ public class SaveServiceAddressDTO {
     @NotBlank(message = "请输入详细地址")
     private String address;
 
-    @ApiModelProperty(value = "是否默认收货地址", required = true)
-    @NotNull(message = "请确认地址是否默认")
-    private Boolean def;
+//    @ApiModelProperty(value = "是否默认收货地址", required = true)
+//    @NotNull(message = "请确认地址是否默认")
+//    private Boolean def;
 
 }
\ No newline at end of file

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

@@ -52,8 +52,8 @@ public class UpdateServiceAddressDTO {
     @NotBlank(message = "请输入详细地址")
     private String address;
 
-    @ApiModelProperty(value = "是否默认收货地址", required = true)
-    @NotNull(message = "请确认地址是否默认")
-    private Boolean def;
+//    @ApiModelProperty(value = "是否默认收货地址", required = true)
+//    @NotNull(message = "请确认地址是否默认")
+//    private Boolean def;
 
 }
\ No newline at end of file

mini-app/src/main/java/com/onsiteservice/miniapp/service/address/ServiceAddressService.java

@@ -88,7 +88,7 @@ public class ServiceAddressService extends AbstractMapper<ServiceAddress> {
         ServiceAddress serviceAddress = AttrCopyUtils.copy(dto, new ServiceAddress());
         serviceAddress.setAccountNo(userId);
         // 有默认收货地址的话,置为非默认
-        checkAndCancelDefaultServiceAddress(serviceAddress, userId);
+        // checkAndCancelDefaultServiceAddress(serviceAddress, userId);
 
         return this.insertSelective(serviceAddress);
     }
@@ -101,7 +101,7 @@ public class ServiceAddressService extends AbstractMapper<ServiceAddress> {
 
         ServiceAddress serviceAddress = AttrCopyUtils.copy(dto, new ServiceAddress());
         serviceAddress.setAccountNo(userId);
-        checkAndCancelDefaultServiceAddress(serviceAddress, userId);
+        // checkAndCancelDefaultServiceAddress(serviceAddress, userId);
 
         Condition c = new Condition(ServiceAddress.class);
         c.createCriteria().andEqualTo("id", dto.getId()).andEqualTo(BizConstants.UserConstants.ACCOUNT_NO, userId);
@@ -135,22 +135,40 @@ public class ServiceAddressService extends AbstractMapper<ServiceAddress> {
     /**
      * 判断有没有默认收货地址,有的话取消
      *
-     * @param serviceAddress 服务地址DO
      * @param userId         用户id
      */
-    private void checkAndCancelDefaultServiceAddress(ServiceAddress serviceAddress, Long userId) {
-        if (serviceAddress.getDef()) {
-            Condition c = new Condition(ServiceAddress.class);
-            c.createCriteria().andEqualTo(BizConstants.UserConstants.ACCOUNT_NO, userId)
-                    .andEqualTo("def", true);
-            List<ServiceAddress> defaultServiceAddressList = this.selectByCondition(c);
-            if (!CollectionUtils.isEmpty(defaultServiceAddressList)) {
-                defaultServiceAddressList.forEach(defaultServiceAddress -> {
-                    defaultServiceAddress.setDef(false);
-                    this.updateByPrimaryKeySelective(defaultServiceAddress);
-                });
-            }
+    private void checkAndCancelDefaultServiceAddress(Long userId) {
+        Condition c = new Condition(ServiceAddress.class);
+        c.createCriteria().andEqualTo(BizConstants.UserConstants.ACCOUNT_NO, userId)
+                .andEqualTo("def", true);
+        List<ServiceAddress> defaultServiceAddressList = this.selectByCondition(c);
+
+        if (!CollectionUtils.isEmpty(defaultServiceAddressList)) {
+            defaultServiceAddressList.forEach(defaultServiceAddress -> {
+                defaultServiceAddress.setDef(false);
+                this.updateByPrimaryKeySelective(defaultServiceAddress);
+            });
+        }
+
+    }
+
+
+    public int defaultAddress(Long id, Long userId) {
+        log.info("address defaultAddress id: {}, userId: {}", id, userId);
+
+        checkAndCancelDefaultServiceAddress(userId);
+
+        Condition c = new Condition(ServiceAddress.class);
+        c.createCriteria().andEqualTo(BizConstants.UserConstants.ACCOUNT_NO, userId).andEqualTo("id", id);
+        List<ServiceAddress> serviceAddressList = this.selectByCondition(c);
+        if (CollectionUtils.isEmpty(serviceAddressList)) {
+            throw new ServiceException(BizCodeEnum.SERVICE_ADDRESS_NOT_EXIST);
         }
+
+        ServiceAddress serviceAddress = serviceAddressList.get(0);
+        serviceAddress.setDef(true);
+
+        return this.updateByPrimaryKeySelective(serviceAddress);
     }