Merge branch 'develop'

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/fdd/dto/ContractInfoDTO.java

+package com.mmc.iuav.user.model.fdd.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * (ContractInfoDO)实体类
+ *
+ * @author makejava
+ * @since 2023-09-07 10:14:08
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ContractInfoDTO implements Serializable {
+    private static final long serialVersionUID = -42558889792167148L;
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    @ApiModelProperty(value = "发起合同方用户唯一标识")
+    private String unionId;
+
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+
+    @ApiModelProperty(value = "合同编号")
+    private String contractNo;
+
+    @ApiModelProperty(value = "合同标题")
+    private String contractTitle;
+
+    @ApiModelProperty(value = "状态： 0、等待平台签署1、平台签署失败 2、等待（买家/供应商）签署（平台签署成功） 3、（买家/供应商）签署失败 4、（买家/供应商）签署成功、5、归档")
+    private Integer signStatus;
+
+    @ApiModelProperty(value = "签署完成日期")
+    private Date singerTime;
+
+    @ApiModelProperty(value = "平台签署失败备注信息")
+    private String aRemark;
+
+    @ApiModelProperty(value = "（买家/供应商）签署失败备注信息")
+    private String bRemark;
+
+    @ApiModelProperty(value = "平台签署交易号")
+    private String aTransactionId;
+
+    @ApiModelProperty(value = "（买家/供应商）签署交易号")
+    private String bTransactionId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "归档日期")
+    private Date archiveDate;
+}
+

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/fdd/dto/SealInfoDTO.java

+package com.mmc.iuav.user.model.fdd.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author LW
+ * @date 2022/8/4 14:20
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class SealInfoDTO implements Serializable {
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @ApiModelProperty(value = "印章名称")
+    private String sealName;
+    @ApiModelProperty(value = "印章编号")
+    private String signatureId;
+    @ApiModelProperty(value = "印章状态： 0：默认 1：未启用")
+    private Integer sealStatus;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    @ApiModelProperty(value = "印章图片")
+    private String sealUrl;
+}

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/fdd/dto/UserFddDTO.java

 package com.mmc.iuav.user.model.fdd.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -20,12 +21,20 @@ import java.util.Date;
 public class UserFddDTO implements Serializable {
 
     private static final long serialVersionUID = -4952516407490131779L;
+    @ApiModelProperty(value = "id")
     private Integer id;
+    @ApiModelProperty(value = "用户唯一标识")
     private String unionId;
+    @ApiModelProperty(value = "客户id")
     private String customerId;
+    @ApiModelProperty(value = "个人实名认证状态")
     private Integer personVerifyStatus;
+    @ApiModelProperty(value = "企业实名认证状态")
     private Integer entVerifyStatus;
+    @ApiModelProperty(value = "账号类型 1个人 2企业")
     private Integer accountType;
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 }

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/fdd/vo/ContractVO.java

+package com.mmc.iuav.user.model.fdd.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author LW
+ * @date 2022/9/5 14:40
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ContractVO implements Serializable {
+    private static final long serialVersionUID = 570570471824495498L;
+    @ApiModelProperty(value = "合同地址")
+    @NotNull(message = "合同地址不能为空")
+    private String docUrl;
+
+    @ApiModelProperty(value = "订单编号")
+    @NotNull(message = "订单编号不能为空")
+    private String orderNo;
+
+    @ApiModelProperty(value = "合同标题")
+    @NotNull(message = "合同标题不能为空")
+    private String title;
+
+    @ApiModelProperty(value = "端口：0小程序 1后台")
+    private Integer port;
+
+    @ApiModelProperty(value = "unionId", hidden = true)
+    private String unionId;
+}

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/fdd/vo/SealInfoVO.java

+package com.mmc.iuav.user.model.fdd.vo;
+
+import com.mmc.iuav.group.Freeze;
+import com.mmc.iuav.group.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author LW
+ * @date 2022/8/5 17:19
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SealInfoVO implements Serializable {
+    private static final long serialVersionUID = -1288955644357663835L;
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "端口：0小程序 1后台")
+    private Integer port;
+
+    @ApiModelProperty(value = "用户唯一标识", hidden = true)
+    private String uId;
+
+    @ApiModelProperty(value = "页码", required = true)
+    @NotNull(message = "页码不能为空", groups = {Page.class, Freeze.class})
+    @Min(value = 1, groups = Page.class)
+    private Integer pageNo;
+
+    @ApiModelProperty(value = "每页显示数", required = true)
+    @NotNull(message = "每页显示数不能为空", groups = {Page.class, Freeze.class})
+    @Min(value = 1, groups = Page.class)
+    private Integer pageSize;
+
+    public void buildCurrentPage() {
+        this.pageNo = (pageNo - 1) * pageSize;
+    }
+}

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/fdd/vo/SealVO.java

+package com.mmc.iuav.user.model.fdd.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author LW
+ * @date 2023/9/8 11:12
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SealVO implements Serializable {
+    private static final long serialVersionUID = -8686644521460467009L;
+    @ApiModelProperty(value = "印章路径")
+    private String sealUrl;
+    @ApiModelProperty(value = "印章名称")
+    private String sealName;
+    @ApiModelProperty(value = "用户id", hidden = true)
+    private String unionId;
+    @ApiModelProperty(value = "端口：0小程序 1后台")
+    private Integer port;
+}

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/wallet/PayUavWalletVO.java

+package com.mmc.iuav.user.model.vo.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Author LW
+ * @date 2023/9/7 16:07
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PayUavWalletVO implements Serializable {
+
+    private static final long serialVersionUID = 1683979749411588941L;
+
+    @ApiModelProperty(value = "用户ID", required = true)
+    private Integer userAccountId;
+
+    @ApiModelProperty(value = "云享金")
+    private BigDecimal cashAmount;
+
+    @ApiModelProperty(value = "佣金")
+    private BigDecimal salaryAmount;
+
+    @ApiModelProperty(value = "订单状态 100：订单支付  1400:商城订单退款 1500:订单提成", required = true)
+    private Integer orderStatus;
+
+    @ApiModelProperty(value = "订单备注")
+    private String remark;
+}

cms-common/cms-common-util/src/main/java/com/mmc/iuav/response/ResultEnum.java

@@ -18,6 +18,8 @@ public enum ResultEnum implements BaseErrorInfoInterface {
     BUSINESS_LICENSE_CHECK_PARAMETER_ERROR("1002", "企业信息与营业执照信息不一致，请重新上传"),
     THE_BRAND_NAME_CANNOT_BE_EMPTY("1003", "品牌名称不能为空"),
     THE_BRAND_LOGO_CANNOT_BE_EMPTY("1004", "logo图标不能为空"),
+    BUSINESS_LICENSE_CHECK_ERROR("1005", "未进行（企业/个人）认证"),
+    BUSINESS_LICENSE_CHECK_NOT_PASS("1006", "（企业/个人）认证未通过"),
 
     TAG_ALREADY_EXIST_ERROR("2001", "您已拥有该身份，不需要重复提交"),
     TAG_APPLY_ALREADY_EXIST_ERROR("2002", "已存在申请记录，不可重复申请"),

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/constant/fdd/FddConstant.java

@@ -3,12 +3,12 @@ package com.mmc.iuav.user.constant.fdd;
 import org.springframework.stereotype.Component;
 
 /**
- * author:zhenjie
- * Date:2022/7/22
+ * @author:lw Date:2022/7/22
  * time:11:07
  */
 @Component
 public class FddConstant {
+    public static final String SUCCESS_CODE = "1000";
     public static final String CODE = "code";
 
     public static final String DATA = "data";
@@ -26,11 +26,9 @@ public class FddConstant {
     //企业实名认证同步回调
     public static final String RETURN_E_CERT_RES = "fddservlet/fdd/returnECertRes";
     //小程序企业实名认证异步回调
-    public static final String NOTIFY_E_CERT_RES = "fdd/notifyECertRes";
+    public static final String NOTIFY_E_CERT_RES = "fdd/auth/notifyECertRes";
     //签署合同异步回调
-    public static final String NOTIFY_STAMP = "fddservlet/contract/notifyStamp";
-
-    public static final String UAV_NOTIFY_STAMP = "fddservlet/uav/contract/notifyStamp";
+    public static final String NOTIFY_STAMP = "/fdd/contract/notifyStamp";
 
     public static final String APP_ID = "appId";
 
@@ -43,4 +41,10 @@ public class FddConstant {
     public static final String SIGN = "sign";
 
     public static final String UID_REGEX = "[-|_]";
+
+    public static final String YXF = "YXF";
+
+    public static final String SIGN_SUCCESS = "3000";
+
+    public static final String SIGN_FAIL = "3001";
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/CompanyController.java

@@ -131,4 +131,11 @@ public class CompanyController extends BaseController {
     public List<CompanyInfoVO> listCompanyInfoByBUIds(@RequestBody List<Integer> backUserAccountIds) {
         return companyService.listCompanyInfoByBUIds(backUserAccountIds);
     }
+
+    @ApiOperation(value = "根据后台用户id获取公司管理员id")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("getManagerIdByBackUserId")
+    public ResultBody getManagerIdByBackUserId(@RequestParam Integer backUserAccountId) {
+        return companyService.getManagerIdByBackUserId(backUserAccountId);
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/dronepilot/PilotCertificationController.java

@@ -119,7 +119,6 @@ public class PilotCertificationController extends BaseController {
         return certificationService.updateAuditStatus(param, this.getUserLoginInfoFromRedis(request));
     }
 
-
     @ApiOperation(value = "后台管理——日志列表————飞手执照及能力认证")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = PilotCertificationDTO.class)})
     @PostMapping("/backPilotLogList")
@@ -135,5 +134,5 @@ public class PilotCertificationController extends BaseController {
     public PilotCertificationInteriorDTO interiorDetailPilot(@RequestParam(value = "userAccountId", required = true) Integer userAccountId) {
         return certificationService.interiorDetailPilot(userAccountId);
     }
-    
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/fdd/ContractController.java

+package com.mmc.iuav.user.controller.fdd;
+
+import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.controller.BaseController;
+import com.mmc.iuav.user.model.fdd.dto.ContractInfoDTO;
+import com.mmc.iuav.user.model.fdd.vo.ContractVO;
+import com.mmc.iuav.user.service.fdd.ContractService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author LW
+ * @date 2022/9/5 14:31
+ * 概要：
+ */
+@Api(tags = {"合同管理"})
+@RestController
+@RequestMapping("/fdd/contract/")
+public class ContractController extends BaseController {
+    @Autowired
+    private ContractService contractService;
+
+    @ApiOperation(value = "上传合同")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("/uploadContract")
+    public ResultBody uploadContract(@RequestBody ContractVO param, HttpServletRequest request) {
+        return contractService.uploadContract(param, this.getUserLoginInfoFromRedis(request));
+    }
+
+    @ApiOperation(value = "合同预览")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/viewContract")
+    public ResultBody viewContract(@ApiParam(value = "合同编号") @RequestParam(value = "contractId") String contractId) {
+        return contractService.viewContract(contractId);
+    }
+
+    @ApiOperation(value = "下载合同")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/downloadContract")
+    public ResultBody downloadContract(@ApiParam(value = "合同编号") @RequestParam(value = "contractId") String contractId) {
+        return contractService.downloadContract(contractId);
+    }
+
+    @ApiOperation(value = "手动签署")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/stamp")
+    public ResultBody stamp(@ApiParam(value = "合同编号") @RequestParam(value = "contractId") String contractId,
+                            @ApiParam(value = "小程序页面跳转地址") @RequestParam(value = "pages", required = false) String pages,
+                            HttpServletRequest request, @ApiParam(value = "端口：0小程序 1后台") @RequestParam(value = "port") Integer port) {
+        return contractService.stamp(contractId, this.getUserLoginInfoFromRedis(request), pages, port);
+    }
+
+    @ApiOperation(value = "异步处理手动签署信息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("notifyStamp")
+    @ApiIgnore
+    public ResultBody notifyStamp(@RequestParam Map<String, String> map) {
+        return contractService.notifyStamp(map);
+    }
+
+    @ApiOperation(value = "归档")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/file")
+    public ResultBody file(@ApiParam(value = "合同编号") @RequestParam(value = "contractId") String contractId,
+                           HttpServletRequest request, @ApiParam(value = "端口：0小程序 1后台") @RequestParam(value = "port") Integer port) {
+        return contractService.file(contractId, this.getUserLoginInfoFromRedis(request), port);
+    }
+
+    @ApiOperation(value = "根据订单编号数组获取合同的信息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ContractInfoDTO.class)})
+    @PostMapping("/listContractInfoByOrderNo")
+    public List<ContractInfoDTO> getContractInfo(@ApiParam(value = "订单编号list") @RequestBody List<String> orderNos) {
+        return contractService.listContractInfoByOrderNo(orderNos);
+    }
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/fdd/SealManageController.java

+package com.mmc.iuav.user.controller.fdd;
+
+/**
+ * @Author LW
+ * @date 2022/8/31 15:28
+ * 概要：
+ */
+
+import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.controller.BaseController;
+import com.mmc.iuav.user.model.fdd.dto.SealInfoDTO;
+import com.mmc.iuav.user.model.fdd.vo.SealInfoVO;
+import com.mmc.iuav.user.model.fdd.vo.SealVO;
+import com.mmc.iuav.user.service.fdd.SealManageService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Author LW
+ * @date 2022/8/3 10:22
+ * 概要：
+ */
+@Api(tags = {"印章管理模块-接口"})
+@RequestMapping("/seal/")
+@RestController
+public class SealManageController extends BaseController {
+
+    @Autowired
+    private SealManageService sealManageService;
+
+    @ApiOperation(value = "上传印章")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("/uploadSeal")
+    public ResultBody uploadSeal(@RequestBody SealVO sealVO, HttpServletRequest request) {
+        return sealManageService.uploadSeal(sealVO, this.getUserLoginInfoFromRedis(request));
+    }
+
+    @ApiOperation(value = "当前用户印章列表")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = SealInfoDTO.class)})
+    @PostMapping("/getSealInfoList")
+    public ResultBody getSealInfoList(HttpServletRequest request, @RequestBody SealInfoVO param) {
+        return ResultBody.success(sealManageService.getSealInfoList(param, this.getUserLoginInfoFromRedis(request)));
+    }
+
+    @ApiOperation(value = "删除印章")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/removeSeal")
+    public ResultBody removeSeal(@ApiParam(value = "印章编号") @RequestParam(value = "signatureId") String signatureId,
+                                 @ApiParam(value = "端口 0小程序 1后台") Integer port,
+                                 HttpServletRequest request) {
+        return sealManageService.removeSeal(signatureId, port, this.getUserLoginInfoFromRedis(request));
+    }
+
+    @ApiOperation(value = "设置默认签章")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/defaultSeal")
+
+    public ResultBody defaultSeal(@ApiParam(value = "印章编号") @RequestParam(value = "signatureId") String signatureId,
+                                  @ApiParam(value = "端口 0小程序 1后台") Integer port,
+                                  HttpServletRequest request) {
+        return sealManageService.defaultSeal(signatureId, port, this.getUserLoginInfoFromRedis(request));
+    }
+
+    @ApiOperation(value = "查看印章信息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/getSealInfo")
+
+    public ResultBody getSealInfo(@ApiParam(value = "印章编号") @RequestParam(value = "signatureId") String signatureId,
+                                  @ApiParam(value = "端口 0小程序 1后台") Integer port,
+                                  HttpServletRequest request) {
+        return sealManageService.getSealInfo(signatureId, port, this.getUserLoginInfoFromRedis(request));
+    }
+
+    @ApiOperation(value = "编辑印章名称")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("/editSealName")
+    public ResultBody editSealName(@ApiParam(value = "印章编号") @RequestParam(value = "signatureId") String signatureId,
+                                   @ApiParam(value = "端口 0小程序 1后台") Integer port,
+                                   @ApiParam(value = "要修改的印章名称") String sealName,
+                                   HttpServletRequest request) {
+        return sealManageService.editSealName(signatureId, port, this.getUserLoginInfoFromRedis(request), sealName);
+    }
+
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/fdd/UserFddAuthController.java

@@ -6,6 +6,7 @@ import com.mmc.iuav.user.model.fdd.dto.FddVerifyInfoDTO;
 import com.mmc.iuav.user.model.fdd.dto.UserFddDTO;
 import com.mmc.iuav.user.model.fdd.resp.CompanyVerifyResp;
 import com.mmc.iuav.user.model.fdd.resp.PersonVerifyResp;
+import com.mmc.iuav.user.service.fdd.FddService;
 import com.mmc.iuav.user.service.fdd.UserFddAuthService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,14 +20,17 @@ import java.util.Map;
  * @author:lw Date:2022/9/1
  * time:15:44
  */
-@Api(tags = {"fdd用户认证" })
+@Api(tags = {"fdd用户认证"})
 @RestController
-@RequestMapping("/fdd/")
+@RequestMapping("/fdd/auth/")
 public class UserFddAuthController extends BaseController {
 
     @Autowired
     private UserFddAuthService userFddAuthService;
 
+    @Autowired
+    private FddService fddService;
+
     @ApiOperation(value = "注册法大大账号")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = String.class)})
     @ApiIgnore
@@ -49,6 +53,14 @@ public class UserFddAuthController extends BaseController {
         return userFddAuthService.getCompanyVerifyUrl(port, this.getUserLoginInfoFromRedis(request));
     }
 
+    @ApiOperation(value = "申请实名证书")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = String.class)})
+    @GetMapping("getApplyCert")
+    @ApiIgnore
+    public String getApplyCert(@RequestParam String customerId, @RequestParam String transactionNo) {
+        return fddService.getApplyCert(customerId, transactionNo);
+    }
+
     @ApiOperation(value = "异步处理企业实名认证")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @ApiIgnore

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/wallet/PayWalletController.java

@@ -5,6 +5,7 @@ import com.mmc.iuav.user.controller.BaseController;
 import com.mmc.iuav.user.entity.wallet.UserBillingDetailVO;
 import com.mmc.iuav.user.model.dto.wallet.PayWalletDTO;
 import com.mmc.iuav.user.model.qo.wallet.WalletFlowQO;
+import com.mmc.iuav.user.model.vo.wallet.PayUavWalletVO;
 import com.mmc.iuav.user.model.vo.wallet.TopUpOrderVO;
 import com.mmc.iuav.user.model.vo.wallet.WalletFlowVO;
 import com.mmc.iuav.user.service.wallet.PayWalletService;
@@ -77,4 +78,11 @@ public class PayWalletController extends BaseController {
                                                           @ApiParam(value = "详情类型", required = true) @RequestParam String detailType) {
         return payWalletService.billingDetails(id, detailType);
     }
+
+    @ApiOperation(value = "商城订单钱包流水加扣记录", hidden = true)
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("feignPayUavWallet")
+    public ResultBody payUavWallet(@RequestBody PayUavWalletVO payUavWalletVO) {
+        return payWalletService.payUavWallet(payUavWalletVO);
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/CompanyDao.java

@@ -201,4 +201,8 @@ public interface CompanyDao {
     List<CompanyInfoDO> listCompanyInfoByIds(@Param("ids") List<Integer> ids);
 
     void deleteCompanyInfoById(Integer id);
+
+    CompanyMemberDO getManagerByCompanyId(Integer companyInfoId);
+
+    CompanyBackUserDO getCompanyBackUserByBackUserId(Integer backUserAccountId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/fdd/ContractDao.java

+package com.mmc.iuav.user.dao.fdd;
+
+import com.mmc.iuav.user.entity.fdd.ContractInfoDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author LW
+ * @date 2022/9/5 14:47
+ * 概要：
+ */
+@Mapper
+public interface ContractDao {
+
+    /**
+     * 新增无人机城合同信息
+     *
+     * @param uavContractInfoDO
+     */
+    void insertUavContractInfo(ContractInfoDO uavContractInfoDO);
+
+    ContractInfoDO contractInfoByOrderNo(String orderNo, String contractNo);
+
+    void deleteContractInfo(String orderNo);
+
+    void updateContractInfo(ContractInfoDO updateContract);
+
+    List<ContractInfoDO> listContractInfoByOrderNo(@Param(value = "orderNo") List<String> orderNo);
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/fdd/SealManageDao.java

+package com.mmc.iuav.user.dao.fdd;
+
+import com.mmc.iuav.user.entity.fdd.SealInfoDO;
+import com.mmc.iuav.user.model.fdd.vo.SealInfoVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Author LW
+ * @date 2023/9/8 14:36
+ * 概要：
+ */
+@Mapper
+public interface SealManageDao {
+    void insertSealInfo(SealInfoDO sealInfoDO);
+
+    int countSealInfo(SealInfoVO param);
+
+    List<SealInfoDO> getSealInfoList(SealInfoVO param);
+
+    void deletedSealInfo(String signatureId);
+
+    List<SealInfoDO> getSealInfoListByUnionId(String unionId);
+
+    void updateSealStatusById(List<Integer> sealIds);
+
+    void updateSealStatusBySignatureId(String signatureId);
+
+    void updateSealName(String unionId, String signatureId, String sealName);
+
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/fdd/ContractInfoDO.java

+package com.mmc.iuav.user.entity.fdd;
+
+import com.mmc.iuav.user.model.fdd.dto.ContractInfoDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * (ContractInfoDO)实体类
+ *
+ * @author makejava
+ * @since 2023-09-07 10:14:08
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ContractInfoDO implements Serializable {
+    private static final long serialVersionUID = -42558889792167148L;
+
+    private Integer id;
+    /**
+     * 发起合同方用户id
+     */
+    private String unionId;
+    /**
+     * 订单号
+     */
+    private String orderNo;
+    /**
+     * 合同编号
+     */
+    private String contractNo;
+    /**
+     * 合同标题
+     */
+    private String contractTitle;
+    /**
+     * 状态： 0、等待平台签署1、平台签署失败 2、等待（买家/供应商）签署（平台签署成功） 3、（买家/供应商）签署失败 4、（买家/供应商）签署成功、5、归档
+     */
+    private Integer signStatus;
+    /**
+     * 签署完成日期
+     */
+    private Date singerTime;
+    /**
+     * 平台签署失败备注信息
+     */
+    private String aRemark;
+    /**
+     * （买家/供应商）签署失败备注信息
+     */
+    private String bRemark;
+    /**
+     * 平台签署交易号
+     */
+    private String aTransactionId;
+    /**
+     * （买家/供应商）签署交易号
+     */
+    private String bTransactionId;
+
+    private Date createTime;
+
+    private Date updateTime;
+    /**
+     * 归档日期
+     */
+    private Date archiveDate;
+
+    public ContractInfoDTO buildContractInfoDTO() {
+        return ContractInfoDTO.builder().id(this.id).unionId(this.unionId).orderNo(this.orderNo).contractNo(this.contractNo).contractTitle(this.contractTitle)
+                .signStatus(this.signStatus).singerTime(this.singerTime).aRemark(this.aRemark).bRemark(this.bRemark).aTransactionId(this.aTransactionId).bTransactionId(this.bTransactionId)
+                .createTime(this.createTime).updateTime(this.updateTime).archiveDate(this.archiveDate).build();
+    }
+}
+

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/fdd/SealInfoDO.java

+package com.mmc.iuav.user.entity.fdd;
+
+import com.mmc.iuav.user.model.fdd.dto.SealInfoDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * (SealInfoDO)实体类
+ *
+ * @author makejava
+ * @since 2023-09-08 14:30:13
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SealInfoDO implements Serializable {
+    private static final long serialVersionUID = -88451609760389058L;
+
+    private Integer id;
+    /**
+     * 印章名称
+     */
+    private String sealName;
+    /**
+     * 印章编号
+     */
+    private String signatureId;
+    /**
+     * 用户唯一标识
+     */
+    private String unionId;
+    /**
+     * 印章状态：0未使用 1使用中
+     */
+    private Integer sealStatus;
+    /**
+     * 印章图片
+     */
+    private String sealUrl;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    public SealInfoDTO buildSealInfoDTO() {
+        return SealInfoDTO.builder().id(this.id).sealStatus(this.sealStatus).sealName(this.sealName)
+                .signatureId(this.signatureId).createTime(this.createTime).sealUrl(this.sealUrl).build();
+    }
+}
+

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/enums/PayMethodEnums.java

@@ -16,7 +16,9 @@ public enum PayMethodEnums {
     MODIFY_THE_ORDER(800, "修改订单金额状态（大于）"),
     FLYING_HAND_NOT_CONFIRMED_GT(900, "飞手未确认修改金额大于原订单状态"),
     FLYING_HAND_CONFIRM_LT(1000, "飞手确认修改金额小于原订单状态"),
-    USER_TOP_UP(1100, "充值");
+    USER_TOP_UP(1100, "充值"),
+    PAY_UAV_ORDER_REFUND(1400, "商城订单退款"),
+    ORDER_INCOME(1500, "订单收益");
 
     PayMethodEnums(Integer code, String method) {
         this.code = code;

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/CompanyService.java

@@ -168,4 +168,6 @@ public interface CompanyService {
     List<CompanyInfoVO> listCompanyInfoByBUIds(List<Integer> backUserAccountIds);
 
     void deleteCompanyInfoById(Integer id);
+
+    ResultBody getManagerIdByBackUserId(Integer backUserAccountId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/fdd/ContractService.java

+package com.mmc.iuav.user.service.fdd;
+
+import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
+import com.mmc.iuav.user.model.fdd.dto.ContractInfoDTO;
+import com.mmc.iuav.user.model.fdd.vo.ContractVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author LW
+ * @date 2022/9/5 14:38
+ * 概要：
+ */
+public interface ContractService {
+    /**
+     * 上传合同
+     *
+     * @param param
+     * @param id
+     * @return
+     */
+    ResultBody uploadContract(ContractVO param, LoginSuccessDTO loginSuccessDTO);
+
+    ResultBody viewContract(String contractId);
+
+    ResultBody downloadContract(String contractId);
+
+    ResultBody stamp(String contractId, LoginSuccessDTO loginSuccessDTO, String pages, Integer port);
+
+    /**
+     * 异步回调
+     *
+     * @param map
+     * @return
+     */
+    ResultBody notifyStamp(Map<String, String> map);
+
+    ResultBody file(String contractId, LoginSuccessDTO loginSuccessDTO, Integer port);
+
+    List<ContractInfoDTO> listContractInfoByOrderNo(List<String> orderNos);
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/fdd/SealManageService.java

+package com.mmc.iuav.user.service.fdd;
+
+import com.mmc.iuav.page.PageResult;
+import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
+import com.mmc.iuav.user.model.fdd.vo.SealInfoVO;
+import com.mmc.iuav.user.model.fdd.vo.SealVO;
+
+/**
+ * @Author LW
+ * @date 2022/8/31 17:29
+ * 概要：
+ */
+public interface SealManageService {
+    ResultBody uploadSeal(SealVO sealVO, LoginSuccessDTO loginSuccessDTO);
+
+    PageResult getSealInfoList(SealInfoVO param, LoginSuccessDTO loginSuccessDTO);
+
+    ResultBody removeSeal(String signatureId, Integer port, LoginSuccessDTO loginSuccessDTO);
+
+    ResultBody defaultSeal(String signatureId, Integer port, LoginSuccessDTO loginSuccessDTO);
+
+    ResultBody getSealInfo(String signatureId, Integer port, LoginSuccessDTO loginSuccessDTO);
+
+    ResultBody editSealName(String signatureId, Integer port, LoginSuccessDTO loginSuccessDTO, String sealName);
+
+    ResultBody checkAuthStatus(Integer port, LoginSuccessDTO loginSuccessDTO);
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/fdd/UserFddAuthService.java

@@ -29,5 +29,6 @@ public interface UserFddAuthService {
 
     ResultBody getFileByUuid(String uuid, String docType);
 
+
 //    List<UserFddDTO> feignGetAppUserFddInfo(List<String> unionId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/BackUserAccountServiceImpl.java

@@ -145,6 +145,7 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
         return ResultBody.success();
     }
 
+    @Transactional
     @Override
     public ResultBody disableBAccount(Integer accountId, LoginSuccessDTO loginSuccessDTO) {
         CompanyInfoVO companyInfoVO = companyService.getCompanyInfoByBackUserAccountId(accountId);

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CompanyServiceImpl.java

@@ -259,4 +259,14 @@ public class CompanyServiceImpl implements CompanyService {
     public void deleteCompanyInfoById(Integer id) {
         companyDao.deleteCompanyInfoById(id);
     }
+
+    @Override
+    public ResultBody getManagerIdByBackUserId(Integer backUserAccountId) {
+        CompanyBackUserDO companyBackUserDO = companyDao.getCompanyBackUserByBackUserId(backUserAccountId);
+        CompanyMemberDO companyMemberDO = companyDao.getManagerByCompanyId(companyBackUserDO.getCompanyInfoId());
+        if (companyMemberDO == null) {
+            return ResultBody.error("无管理员");
+        }
+        return ResultBody.success(companyMemberDO.getUserAccountId());
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/UserAccountServiceImpl.java

@@ -33,6 +33,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
 
 import java.util.List;
@@ -376,9 +377,9 @@ public class UserAccountServiceImpl implements UserAccountService {
     @Autowired
     private CompanyDao companyDao;
 
+    @Transactional
     @Override
     public ResultBody disableAppAccount(Integer userAccountId) {
-        userServiceDao.disableUserAccount(CodeUtil.removeUserAccount(), userAccountId);
         UserAccountVO userAccountVO = new UserAccountVO();
         userAccountVO.setId(userAccountId);
         userAccountVO.setDeleted(1);
@@ -389,10 +390,12 @@ public class UserAccountServiceImpl implements UserAccountService {
         if (companyInfoDO != null) {
             int members = companyDao.countCompanyMembers(companyInfoDO.getId());
             if (members > 1 && companyInfoDO.getLeader().equals(1)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return ResultBody.error("该用户是单位管理员，暂时不能删除");
             }
             companyDao.unbindCompanyMember(userAccountId, companyInfoDO.getId());
         }
+        userServiceDao.disableUserAccount(CodeUtil.removeUserAccount(), userAccountId);
         mqProducer.sentUserInfoChangedMsg(userAccountVO);
         return ResultBody.success();
     }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/wallet/PayWalletService.java

@@ -2,6 +2,7 @@ package com.mmc.iuav.user.service.wallet;
 
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.model.qo.wallet.WalletFlowQO;
+import com.mmc.iuav.user.model.vo.wallet.PayUavWalletVO;
 import com.mmc.iuav.user.model.vo.wallet.TopUpOrderVO;
 import com.mmc.iuav.user.model.vo.wallet.WalletFlowVO;
 
@@ -22,4 +23,7 @@ public interface PayWalletService {
     ResultBody customerBillingDetail(Integer userAccountId, WalletFlowQO walletFlowQO);
 
     ResultBody billingDetails(Integer id, String detailType);
+
+    ResultBody payUavWallet(PayUavWalletVO payUavWalletVO);
+    
 }

csm-service/cms-service-user/src/main/resources/mapper/CompanyDao.xml

@@ -221,6 +221,10 @@
         select id, back_user_account_id, company_info_id from company_back_user where company_info_id = #{companyInfoId}
     </select>
 
+    <select id="getCompanyBackUserByBackUserId" resultType="com.mmc.iuav.user.entity.CompanyBackUserDO">
+        select id, back_user_account_id, company_info_id from company_back_user where back_user_account_id = #{backUserAccountId}
+    </select>
+
     <select id="getCompanyMember" resultType="com.mmc.iuav.user.entity.CompanyMemberDO">
         select id, user_account_id, company_info_id, is_leader as leader from company_member where company_info_id = #{companyInfoId} and user_account_id = #{userAccountId}
     </select>
@@ -262,4 +266,16 @@
             </foreach>
         </if>
     </select>
+
+    <select id="getManagerByCompanyId" resultType="com.mmc.iuav.user.entity.CompanyMemberDO">
+        SELECT
+            id,
+            user_account_id,
+            company_info_id,
+            is_leader,
+            create_time
+        FROM
+            company_member cm
+        where company_info_id = #{companyInfoId} and is_leader = 1
+    </select>
 </mapper>
\ No newline at end of file

csm-service/cms-service-user/src/main/resources/mapper/UserServiceDao.xml

@@ -163,10 +163,11 @@
 
     <select id="feignListUserAccount" resultType="com.mmc.iuav.user.entity.UserAccountDO"
             parameterType="com.mmc.iuav.user.model.qo.UserAccountQO">
-        select ua.id, ua.phone_num, ua.user_name, ua.nick_name, ua.user_img, ua.open_id,
+        select ua.id, ua.phone_num, rna.user_name, ua.nick_name, ua.user_img, ua.open_id,
         ua.union_id, ua.user_sex, ua.email, ua.source, ua.account_status, ua.remark,
         ua.port_type, ua.disable, ua.create_time, ua.update_time, ca.auth_status as companyAuthStatus
-        from user_account ua left join company_auth ca on ua.id = ca.user_account_id
+        from user_account ua left join company_auth ca on ua.id = ca.user_account_id left join real_name_auth rna on
+        ua.id = rna.user_account_id
         where ua.disable = 0
         <if test=" userIds != null ">
             <foreach collection="userIds" item="id" open="and ua.id in (" close=")" separator=",">

csm-service/cms-service-user/src/main/resources/mapper/fdd/ContractDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mmc.iuav.user.dao.fdd.ContractDao">
+    <insert id="insertUavContractInfo">
+        insert into contract_info (union_id, order_no, contract_no, contract_title)
+        values (#{unionId}, #{orderNo}, #{contractNo}, #{contractTitle})
+    </insert>
+    <update id="updateContractInfo">
+        update contract_info
+        <set>
+            <if test="signStatus != null">
+                sign_status = #{signStatus},
+            </if>
+            <if test="singerTime != null">
+                singer_time = #{singerTime},
+            </if>
+            <if test="aRemark != null">
+                a_remark = #{aRemark},
+            </if>
+            <if test="bRemark != null">
+                b_remark = #{bRemark},
+            </if>
+            <if test="aTransactionId != null">
+                a_transaction_id = #{aTransactionId},
+            </if>
+            <if test="bTransactionId != null">
+                b_transaction_id = #{bTransactionId},
+            </if>
+            <if test="archiveDate != null">
+                archive_date = #{archiveDate}
+            </if>
+        </set>
+        where contract_no = #{contractNo}
+    </update>
+    <delete id="deleteContractInfo">
+        delete
+        from contract_info
+        where order_no = #{orderNo}
+    </delete>
+
+    <select id="contractInfoByOrderNo" resultType="com.mmc.iuav.user.entity.fdd.ContractInfoDO">
+        select id,
+        union_id,
+        order_no,
+        contract_no,
+        contract_title,
+        sign_status,
+        singer_time,
+        a_remark,
+        b_remark,
+        a_transaction_id,
+        b_transaction_id,
+        create_time,
+        update_time,
+        archive_date
+        from contract_info
+        <where>
+            <if test="orderNo != null">
+                order_no = #{orderNo}
+            </if>
+            <if test="contractNo != null">
+                contract_no = #{contractNo}
+            </if>
+        </where>
+    </select>
+    <select id="listContractInfoByOrderNo" resultType="com.mmc.iuav.user.entity.fdd.ContractInfoDO">
+        select id,
+        union_id,
+        order_no,
+        contract_no,
+        contract_title,
+        sign_status,
+        singer_time,
+        a_remark,
+        b_remark,
+        a_transaction_id,
+        b_transaction_id,
+        create_time,
+        update_time,
+        archive_date
+        from contract_info
+        <where>
+            <if test="orderNo != null">
+                <foreach collection="orderNo" item="orderNo" separator=",">
+                    order_no = #{orderNo}
+                </foreach>
+            </if>
+        </where>
+    </select>
+</mapper>
\ No newline at end of file

csm-service/cms-service-user/src/main/resources/mapper/fdd/SealManageDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mmc.iuav.user.dao.fdd.SealManageDao">
+    <insert id="insertSealInfo">
+        insert into seal_info (seal_name, signature_id, seal_url, union_id)
+        values (#{sealName}, #{signatureId}, #{sealUrl}, #{unionId})
+    </insert>
+    <update id="updateSealStatusById">
+        update seal_info set seal_status = 0
+        where id in
+        <foreach collection="list" separator="," index="index" item="item" open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+    <update id="updateSealStatusBySignatureId">
+        update seal_info
+        set seal_status = 1
+        where signature_id = #{signatureId}
+    </update>
+    <update id="updateSealName">
+        update seal_info
+        set seal_name = #{sealName}
+        where signature_id = #{signatureId}
+          and union_id = #{unionId}
+    </update>
+    <delete id="deletedSealInfo">
+        delete
+        from seal_info
+        where signature_id = #{signatureId}
+    </delete>
+    <select id="countSealInfo" resultType="java.lang.Integer">
+        SELECT
+        count(*)
+        FROM seal_info
+        <where>
+            union_id = #{uId}
+            <if test="startTime != null and startTime != '' ">
+                and create_time &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != '' ">
+                and create_time &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+    </select>
+    <select id="getSealInfoList" resultType="com.mmc.iuav.user.entity.fdd.SealInfoDO">
+        SELECT id,
+        seal_name,
+        signature_id,
+        union_id,
+        seal_status,
+        seal_url,
+        create_time
+        FROM seal_info
+        <where>
+            union_id = #{uId}
+            <if test="startTime != null and startTime != '' ">
+                and create_time &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != '' ">
+                and create_time &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        ORDER BY seal_status desc ,create_time desc
+        limit #{pageNo}, #{pageSize}
+    </select>
+    <select id="getSealInfoListByUnionId" resultType="com.mmc.iuav.user.entity.fdd.SealInfoDO">
+        SELECT id,
+               seal_name,
+               signature_id,
+               union_id,
+               seal_status,
+               seal_url,
+               create_time
+        FROM seal_info
+        where union_id = #{uId}
+    </select>
+</mapper>
\ No newline at end of file

csm-service/cms-service-user/src/main/resources/mapper/fdd/UserFddAuthDao.xml

@@ -51,7 +51,14 @@
         where customer_id = #{customerId}
     </select>
     <select id="getAppUserFddInfo" resultType="com.mmc.iuav.user.entity.fdd.UserFddDO">
-        select id, customer_id, person_verify_status, ent_verify_status, account_type, create_time, update_time
+        select id,
+               customer_id,
+               union_id,
+               person_verify_status,
+               ent_verify_status,
+               account_type,
+               create_time,
+               update_time
         from user_fdd
         where union_id = #{unionId}
     </select>

csm-service/cms-service-user/src/main/resources/not-check.yml

@@ -23,6 +23,7 @@ data-filter:
     - /userapp/company/getCompanyInfoById
     - /userapp/company/listCompanyInfoByIds
     - /userapp/company/listCompanyInfoByBUIds
+    - /userapp/company/getManagerIdByBackUserId
     - /userapp/cooperation/service/bitmap
     - /userapp/cooperation/listCompanyInfoByCoopId
     - /userapp/cooperation/appBrandList
@@ -33,4 +34,7 @@ data-filter:
     - /userapp/xz/xzWithdrawNotify
     - /userapp/pay/feignTopUpCash
     - /userapp/pay/feignWalletFlowNO
+    - /userapp/pay/feignPayUavWallet
+    - /userapp/fdd/contract/notifyStamp
+    - /userapp/fdd/auth/notifyECertRes
 

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: d6374ab7d29958354b2b0f4cc1e6e29f6b17f717
+  newTag: ca052edd5a7e95f4d20df7935fad9c5b9ba2feee