同步物流业务代码

yudao-module-backend-logistics/yudao-module-backend-logistics-server/src/main/java/cn/iocoder/yudao/module/backendlogistics/controller/admin/backendlogistics/bseMngt/acct/ChildAccountController.java

@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.acct;
+
+import cn.iocoder.yudao.framework.business.annotation.FileUploadController;
+import cn.iocoder.yudao.framework.business.interceptor.BusinessControllerMarker;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.acct.vo.ChildAccountPageReqVo;
+import cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.acct.vo.ChildAccountRespVo;
+import cn.iocoder.yudao.module.backendlogistics.service.bseMngt.acct.ChildAccountService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 子账号")
+@RestController
+@RequestMapping("/lgst/child-account")
+@Validated
+@FileUploadController(source = "lgst.childaccount")
+public class ChildAccountController implements BusinessControllerMarker {
+    @Resource
+    private ChildAccountService childAccountService;
+    @PostMapping("/page")
+    @Operation(summary = "获取子账号分页数据")
+   // @PreAuthorize("@ss.hasPermission('lgst:carrier-account:query')")
+    public CommonResult<PageResult<ChildAccountRespVo>> getCarrierAccountPage(@RequestBody ChildAccountPageReqVo pageReqVO) {
+        PageResult<ChildAccountRespVo> pageResult =childAccountService.getChildAccountPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, ChildAccountRespVo.class));
+    }
+}

yudao-module-backend-logistics/yudao-module-backend-logistics-server/src/main/java/cn/iocoder/yudao/module/backendlogistics/controller/admin/backendlogistics/bseMngt/acct/CollaborationChildAccountController.java

@@ -0,0 +1,89 @@
+package cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.acct;
+
+import cn.iocoder.yudao.framework.business.interceptor.BusinessControllerMarker;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.acct.vo.ChildAccountPageReqVo;
+import cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.acct.vo.ChildAccountRespVo;
+import cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.acct.vo.ChildAccountSaveReqVo;
+import cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.common.vo.IdVo;
+import cn.iocoder.yudao.module.backendlogistics.service.bseMngt.acct.ChildAccountService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "物流协同 - 子账号")
+@RestController
+@RequestMapping("/lgst/collaboration/child-account")
+@Validated
+public class CollaborationChildAccountController implements BusinessControllerMarker {
+    @Resource
+    private ChildAccountService childAccountService;
+    /**
+     * 协同查询子账号分页数据
+     * @param reqVo
+     * @return
+     */
+    @PostMapping("/page")
+    @Operation(summary = "获取子账号分页数据")
+    @PreAuthorize("@ss.hasPermission('lgst:collaboration:child-account:query')")
+    public CommonResult<PageResult<ChildAccountRespVo>> getCollChildAccountPage(@RequestBody ChildAccountPageReqVo reqVo){
+        PageResult<ChildAccountRespVo> collChildAccountPage = childAccountService.getCollChildAccountPage(reqVo);
+        return success(collChildAccountPage);
+    }
+
+    /**
+     * 删除子账号
+     * @param vo
+     */
+    @PostMapping("/delete")
+    @Operation(summary = "删除子账号")
+    @PreAuthorize("@ss.hasPermission('lgst:collaboration:child-account:delete')")
+    public CommonResult<Boolean> deleteChildAccount(@RequestBody IdVo vo){
+        childAccountService.deleteChildAccount(vo.getId());
+        return success(true);
+    }
+
+    /**
+     * 修改子账号数据
+     * @param saveReqVo
+     */
+    @PostMapping("/update")
+    @Operation(summary = "修改子账号")
+    @PreAuthorize("@ss.hasPermission('lgst:collaboration:child-account:update')")
+    public CommonResult<Boolean> updateChildAccount(@RequestBody ChildAccountSaveReqVo saveReqVo){
+        childAccountService.updateChildAccount(saveReqVo);
+        return success(true);
+    }
+
+    /**
+     * 修改子账号密码
+     * @param saveReqVo
+     */
+    @PostMapping("/updatePassword")
+    @Operation(summary = "修改子账号密码")
+    @PreAuthorize("@ss.hasPermission('lgst:collaboration:child-account:updatePassword')")
+    public CommonResult<Boolean> updateChildPassword(@RequestBody ChildAccountSaveReqVo saveReqVo){
+        childAccountService.updateChildPassword(saveReqVo);
+        return success(true);
+    }
+    /**
+     * 创建子账号
+     * @param saveReqVo
+     */
+    @PostMapping("/create")
+    @Operation(summary = "创建子账号")
+    @PreAuthorize("@ss.hasPermission('lgst:collaboration:child-account:create')")
+    public CommonResult<Boolean> create(@RequestBody ChildAccountSaveReqVo saveReqVo){
+        childAccountService.craete(saveReqVo);
+        return success(true);
+    }
+}

yudao-module-backend-logistics/yudao-module-backend-logistics-server/src/main/java/cn/iocoder/yudao/module/backendlogistics/controller/admin/backendlogistics/bseMngt/acct/CollaborationCompanyController.java

@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.acct;
+
+import cn.iocoder.yudao.framework.business.annotation.FileUploadController;
+import cn.iocoder.yudao.framework.business.interceptor.BusinessControllerMarker;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.acct.vo.CollaborationCompanyRespVo;
+import cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.acct.vo.CollaborationCompanySaveReqVo;
+import cn.iocoder.yudao.module.backendlogistics.service.bseMngt.acct.CollaborationCompanyService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "物流协同 -企业信息")
+@RestController
+@RequestMapping("/lgst/collaboration/company")
+@Validated
+@FileUploadController(source = "lgst.coll.company")
+public class CollaborationCompanyController implements BusinessControllerMarker {
+    @Resource
+    private CollaborationCompanyService collaborationCompanyService;
+
+    @GetMapping("/getCompanyDetail")
+    @Operation(summary = "获取企业信息")
+    @PreAuthorize("@ss.hasPermission('lgst:coll:company:getCompanyDetail')")
+    public CommonResult<CollaborationCompanyRespVo> getCompanyDetail() {
+        CollaborationCompanyRespVo collaborationCompany = collaborationCompanyService.getCollaborationCompany();
+        return success(collaborationCompany);
+    }
+
+    /**
+     * 修改登录手机号
+     *
+     * @param saveReqVo
+     */
+    @PostMapping("/updateTel")
+    @Operation(summary = "修改手机号")
+    @PreAuthorize("@ss.hasPermission('lgst:coll:company:updateTel')")
+    public CommonResult<Boolean> updateTel(@RequestBody CollaborationCompanySaveReqVo saveReqVo) {
+        collaborationCompanyService.updateTel(saveReqVo);
+        return success(true);
+    }
+}

yudao-module-backend-logistics/yudao-module-backend-logistics-server/src/main/java/cn/iocoder/yudao/module/backendlogistics/controller/admin/backendlogistics/bseMngt/acct/vo/CarrierAccountRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.acct.vo;
 
+import cn.iocoder.yudao.module.infra.api.businessfile.dto.BusinessFileWithUrlRespDTO;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -7,6 +8,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 物流服务商协同账号 Response VO")
 @Data
@@ -25,6 +27,18 @@ public class CarrierAccountRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "修改时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("修改时间")
+    private LocalDateTime updateTime;
+
+    @Schema(description = "创建人")
+    @ExcelProperty("创建人")
+    private String creatorName;
+
+    @Schema(description = "修改人")
+    @ExcelProperty("修改人")
+    private String updaterName;
+
     @Schema(description = "状态", example = "2")
     @ExcelProperty("状态")
     private String status;
@@ -85,12 +99,59 @@ public class CarrierAccountRespVO {
     @ExcelProperty("是否长期")
     private Integer isPermanently;
 
-    @Schema(description = "开户行", example = "15940")
-    @ExcelProperty("开户行")
+    @Schema(description = "银行账号", example = "15940")
+    @ExcelProperty("银行账号")
     private String bankAccount;
 
     @Schema(description = "登记机关")
     @ExcelProperty("登记机关")
     private String registrationAgency;
 
+    /**
+     * 主数据编码
+     */
+    @Schema(description = "主数据编码")
+    @ExcelProperty("主数据编码")
+    private String mdmCode;
+
+    /**
+     * 用户类型
+     */
+    @Schema(description = "用户类型")
+    @ExcelProperty("用户类型")
+    private String userType;
+
+    /**
+     * 开户行名称
+     */
+    @Schema(description = "开户行名称")
+    @ExcelProperty("开户行名称")
+    private String bankName;
+    /**
+     * 绑定部门id
+     */
+    @Schema(description = "绑定部门id")
+    private Long bidDeptId;
+
+    /**
+     * sap编码
+     */
+    @Schema(description = "sap编码")
+    @ExcelProperty("sap编码")
+    private Long sapCode;
+
+    @Schema(description = "营业执照附件")
+    private BusinessFileWithUrlRespDTO businessLicenseFile;
+
+    @Schema(description = "法人身份证-正面")
+    private BusinessFileWithUrlRespDTO identityFrontFile;
+
+    @Schema(description = "法人身份证-反面")
+    private BusinessFileWithUrlRespDTO identityBackFile;
+
+    @Schema(description = "修改说明附件")
+    private BusinessFileWithUrlRespDTO editFile;
+
+    @Schema(description = "其他附件")
+    private List<BusinessFileWithUrlRespDTO> otherFile;
 }

yudao-module-backend-logistics/yudao-module-backend-logistics-server/src/main/java/cn/iocoder/yudao/module/backendlogistics/controller/admin/backendlogistics/bseMngt/acct/vo/CarrierAccountSaveReqVO.java

@@ -1,43 +1,39 @@
 package cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.acct.vo;
 
+import cn.iocoder.yudao.module.infra.api.businessfile.dto.BusinessFileSaveReqDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 物流服务商协同账号新增/修改 Request VO")
 @Data
 public class CarrierAccountSaveReqVO {
 
-    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9531")
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long id;
 
     @Schema(description = "备注")
     private String remark;
 
-    @Schema(description = "状态", example = "2")
-    private String status;
-
-    @Schema(description = "是否启用")
-    private String isEnable;
-
-    @Schema(description = "登录账号", example = "27315")
+    @Schema(description = "登录账号")
     private String loginAccount;
 
     @Schema(description = "登录手机号", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "登录手机号不能为空")
     private String loginTel;
 
-    @Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "公司名称不能为空")
     private String name;
 
     @Schema(description = "社会统一信用代码")
     private String creditCode;
 
-    @Schema(description = "法人姓名", example = "王五")
+    @Schema(description = "法人姓名")
     private String agentName;
 
     @Schema(description = "法人身份证")
@@ -64,10 +60,47 @@ public class CarrierAccountSaveReqVO {
     @Schema(description = "是否长期")
     private Integer isPermanently;
 
-    @Schema(description = "开户行", example = "15940")
+    @Schema(description = "银行账号")
     private String bankAccount;
 
     @Schema(description = "登记机关")
     private String registrationAgency;
 
+    @Schema(description = "营业执照附件")
+    private BusinessFileSaveReqDTO businessLicenseFile;
+
+    @Schema(description = "法人身份证-正面")
+    private BusinessFileSaveReqDTO identityFrontFile;
+
+    @Schema(description = "法人身份证-反面")
+    private BusinessFileSaveReqDTO identityBackFile;
+
+    @Schema(description = "修改说明附件")
+    private BusinessFileSaveReqDTO editFile;
+
+    @Schema(description = "其他附件")
+    private List<BusinessFileSaveReqDTO> otherFile;
+    /**
+     * 主数据编码
+     */
+    @Schema(description = "主数据编码")
+    private String mdmCode;
+
+    /**
+     * 用户类型
+     */
+    @Schema(description = "用户类型")
+
+    private String userType;
+    /**
+     * 开户行名称
+     */
+    @Schema(description = "开户行名称")
+    private String bankName;
+
+    /**
+     * 绑定部门id
+     */
+    @Schema(description = "绑定部门id")
+    private Long bidDeptId;
 }

yudao-module-backend-logistics/yudao-module-backend-logistics-server/src/main/java/cn/iocoder/yudao/module/backendlogistics/controller/admin/backendlogistics/bseMngt/acct/vo/ChildAccountPageReqVo.java

@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.acct.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "协同账号管理-子账号")
+@Data
+public class ChildAccountPageReqVo extends PageParam {
+
+    @Schema(description = "绑定部门id")
+    private Long bidDeptId;
+    @Schema(description = "姓名")
+    private String nickname;
+    @Schema(description = "登录账号")
+    private String username;
+    @Schema(description = "登录手机号")
+    private String mobile;
+}

yudao-module-backend-logistics/yudao-module-backend-logistics-server/src/main/java/cn/iocoder/yudao/module/backendlogistics/controller/admin/backendlogistics/bseMngt/acct/vo/ChildAccountRespVo.java

@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.acct.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "子账号返回值")
+@Data
+public class ChildAccountRespVo {
+    @Schema(description = "子账号id")
+    private Long id;
+
+    @Schema(description = "子账号")
+    private String username;
+
+    @Schema(description = "姓名")
+    private String nickname;
+
+    @Schema(description = "登录手机号")
+    private String mobile;
+
+    @Schema(description = "状态")
+    private String status;
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+    @Schema(description = "创建人")
+    private String creatorName;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime updateTime;
+
+}