修改BUG

alien-entity/src/main/java/shop/alien/entity/store/dto/StoreStaffConfigListQueryDto.java

@@ -1,9 +1,11 @@
 package shop.alien.entity.store.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -37,9 +39,13 @@ public class StoreStaffConfigListQueryDto {
     private String staffName;
 
     @ApiModelProperty(value = "创建时间开始（yyyy-MM-dd HH:mm:ss）")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date startCreatedTime;
 
     @ApiModelProperty(value = "创建时间结束（yyyy-MM-dd HH:mm:ss）")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endCreatedTime;
 }
 

alien-lawyer/src/main/java/shop/alien/lawyer/controller/LawyerUserController.java

@@ -313,6 +313,7 @@ public class LawyerUserController {
             @ApiImplicitParam(name = "address", value = "联系地址", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "introduction", value = "律师简介", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "headImg", value = "律师头像", dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "businessLicenseImage", value = "营业执照图片URL", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "certificationTime", value = "认证时间（从业时间？？待确认）", dataType = "Data", paramType = "query"),
     })
     @PostMapping("/updateLawyerUser")

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerUserServiceImpl.java

@@ -695,11 +695,14 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
                 log.warn("更新律所信息失败：更新数据库失败，律师ID={}", lawyerUserVo.getId());
                 return R.fail("修改律师信息失败");
             }
-            //根据律师表中的firm_id进行修改账号和地址
+            //根据律师表中的firm_id进行修改账号和地址（律所地址优先取 addressNew）
             UpdateWrapper<LawFirmPayment> updateWrapper = new UpdateWrapper<>();
             updateWrapper.eq("firm_id", lawyerUserVo.getFirmId())
-                    .set("payment_account", lawyerUserVo.getPaymentNum()) // 假设有账号字段
-                    .set("address", lawyerUserVo.getAddress()); // 假设有地址字段
+                    .set("payment_account", lawyerUserVo.getPaymentNum());
+            String firmPaymentAddress = StringUtils.hasText(lawyerUserVo.getAddressNew())
+                    ? lawyerUserVo.getAddressNew()
+                    : lawyerUserVo.getAddress();
+            updateWrapper.set("address", firmPaymentAddress);
             lawFirmPaymentmapper.update(null, updateWrapper);
 
         }
@@ -735,6 +738,29 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
             lawyerUser.setCertificateImage(lawyerUserVo.getCertificateImage());
             hasUpdate = true;
         }
+        if (lawyerUserVo.getBusinessLicenseImage() != null) {
+            lawyerUser.setBusinessLicenseImage(lawyerUserVo.getBusinessLicenseImage());
+            hasUpdate = true;
+        }
+        if (lawyerUserVo.getProvince() != null) {
+            lawyerUser.setProvince(lawyerUserVo.getProvince());
+            hasUpdate = true;
+        }
+        if (lawyerUserVo.getCity() != null) {
+            lawyerUser.setCity(lawyerUserVo.getCity());
+            hasUpdate = true;
+        }
+        if (lawyerUserVo.getDistrict() != null) {
+            lawyerUser.setDistrict(lawyerUserVo.getDistrict());
+            hasUpdate = true;
+        }
+        String profileAddress = StringUtils.hasText(lawyerUserVo.getAddress())
+                ? lawyerUserVo.getAddress()
+                : lawyerUserVo.getAddressNew();
+        if (profileAddress != null) {
+            lawyerUser.setAddress(profileAddress);
+            hasUpdate = true;
+        }
 
         // 修改执业证、姓名或头像时，先走 AI 执业证核验（与库中数据合并后校验）
 //        if (lawyerUserVo.getCertificateImage() != null || lawyerUserVo.getName() != null || lawyerUserVo.getHeadImg() != null) {

alien-store/src/main/java/shop/alien/store/controller/StoreStaffConfigController.java

@@ -2,27 +2,20 @@ package shop.alien.store.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.*;
-import springfox.documentation.annotations.ApiIgnore;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.StoreStaffConfig;
-import shop.alien.entity.store.StoreStaffTitle;
 import shop.alien.entity.store.UserLoginInfo;
-import shop.alien.util.common.TokenInfo;
 import shop.alien.entity.store.dto.StoreStaffConfigListQueryDto;
-import shop.alien.entity.store.vo.StaffTitleGroupVo;
-import shop.alien.entity.store.vo.StoreStaffDetailVo;
-import shop.alien.entity.store.vo.StoreStaffDetailWithPerformanceVo;
-import shop.alien.entity.store.vo.StoreStaffFitnessDetailVo;
-import shop.alien.entity.store.vo.StoreStaffPositionCountVo;
+import shop.alien.entity.store.vo.*;
 import shop.alien.mapper.StoreDictionaryMapper;
 import shop.alien.store.service.StoreStaffConfigService;
-import shop.alien.store.service.StoreStaffTitleService;
 import shop.alien.store.util.CommonConstant;
+import shop.alien.util.common.TokenInfo;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.io.IOException;
 import java.util.List;
@@ -54,8 +47,8 @@ public class StoreStaffConfigController {
             @ApiImplicitParam(name = "onlineStatus", value = "上线状态（0-上线 1-下线）", dataType = "Integer", paramType = "query", required = false),
             @ApiImplicitParam(name = "staffPosition", value = "职位", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "staffName", value = "员工姓名", dataType = "String", paramType = "query", required = false),
-            @ApiImplicitParam(name = "startCreatedTime", value = "创建时间开始（yyyy-MM-dd HH:mm:ss）", dataType = "String", paramType = "query", required = false),
-            @ApiImplicitParam(name = "endCreatedTime", value = "创建时间结束（yyyy-MM-dd HH:mm:ss）", dataType = "String", paramType = "query", required = false),
+            @ApiImplicitParam(name = "startCreatedTime", value = "创建时间开始（yyyy-MM-dd HH:mm:ss）", dataType = "Date", paramType = "query", required = false),
+            @ApiImplicitParam(name = "endCreatedTime", value = "创建时间结束（yyyy-MM-dd HH:mm:ss）", dataType = "Date", paramType = "query", required = false),
     })
     @GetMapping("/getStaffConfigList")
     public R<IPage<StoreStaffConfig>> getStaffConfigList(StoreStaffConfigListQueryDto query) {