Merge branch 'develop'

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/data/ProductReportDTO.java

@@ -16,6 +16,8 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @Builder
 public class ProductReportDTO {
+    @ApiModelProperty(value = "企业认证总数")
+    private Integer companyAuthCount;
     @ApiModelProperty(value = "入驻商家总数")
     private Integer joinStoreCount;
     @ApiModelProperty(value = "品牌商")

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/wallet/CashAmountDTO.java

+package com.mmc.iuav.user.model.dto.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author LW
+ * @date 2023/10/26 13:49
+ * 概要：
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class CashAmountDTO {
+    @ApiModelProperty(value = "资金池余额")
+    private Double cashPoolAmount;
+    @ApiModelProperty(value = "总提现金额")
+    private BigDecimal totalWithdrawAmt;
+}

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/xzsz/CashPoolingDTO.java

+package com.mmc.iuav.user.model.dto.xzsz;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author LW
+ * @date 2023/10/26 14:03
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CashPoolingDTO {
+    @ApiModelProperty(value = "商户企业名称")
+    private String companyName;
+    @ApiModelProperty(value = "可用余额")
+    private Double availableBalance;
+    @ApiModelProperty(value = "冻结余额")
+    private Double holdBalance;
+}

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/ActivityQO.java

@@ -20,6 +20,9 @@ import java.io.Serializable;
 public class ActivityQO implements Serializable {
     private static final long serialVersionUID = -5184984402962050696L;
 
+    @ApiModelProperty(value = "活动名称")
+    private String activityName;
+
     @ApiModelProperty(value = "活动id")
     private Integer activityId;
 

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

+package com.mmc.iuav.user.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author 张培
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AppUserTagVO implements Serializable {
+    @ApiModelProperty(value = "标签id")
+    private Integer cooperationTagId;
+    @ApiModelProperty(value = "标签名称")
+    private String tagName;
+}

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

@@ -49,6 +49,8 @@ public class ApplyTagEditVO implements Serializable {
     private String brandLogo;
     @ApiModelProperty(value = "营业执照")
     private String licenseImg;
-
-
+    @ApiModelProperty(value = "合同编号contractNo")
+    private String contractNo;
+    @ApiModelProperty(value = "合同签署状态")
+    private Integer signStatus;
 }

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

@@ -30,6 +30,9 @@ public class UserApplyTagDetailsVO {
   @ApiModelProperty(value = "附件")
   private List<AttachmentVO> attachmentList;
 
+  @ApiModelProperty(value = "合同订单编号")
+  private String orderNo;
+
   @ApiModelProperty(value = "备注")
   private String remark;
 }

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

@@ -32,6 +32,9 @@ public class UserApplyTagVO implements Serializable {
             groups = {Insert.class})
     private Integer cooperationTagId;
 
+    @ApiModelProperty(value = "加盟合同订单编号")
+    private String orderNo;
+
     @ApiModelProperty(value = "用户id")
     private Integer userAccountId;
 
@@ -91,4 +94,6 @@ public class UserApplyTagVO implements Serializable {
     private Double lon;
 
 
+    @ApiModelProperty(value = "签署状态： 0、等待平台签署1、平台签署失败 2、等待（买家/供应商）签署（平台签署成功） 3、（买家/供应商）签署失败 4、（买家/供应商）签署成功、5、归档")
+    private Integer signStatus;
 }

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

@@ -44,6 +44,8 @@ public class FddConstant {
 
     public static final String YXF = "YXF";
 
+    public static final String FN = "FN";
+
     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/CooperationController.java

@@ -3,6 +3,7 @@ package com.mmc.iuav.user.controller;
 import com.mmc.iuav.group.Insert;
 import com.mmc.iuav.group.Update;
 import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.entity.UserApplyTagDO;
 import com.mmc.iuav.user.model.dto.WebsiteRangeDTO;
 import com.mmc.iuav.user.model.qo.ApplyQO;
 import com.mmc.iuav.user.model.vo.*;
@@ -109,7 +110,7 @@ public class CooperationController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("deleteApplyTag")
     public ResultBody deleteApplyTag(Integer id) {
-        return ResultBody.success(cooperationService.deleteApplyTag(id));
+        return cooperationService.deleteApplyTag(id);
     }
 
     @ApiOperation(value = "审批详情")
@@ -129,6 +130,21 @@ public class CooperationController extends BaseController {
         return cooperationService.approvalApplyTag(id, status);
     }
 
+    @ApiOperation(value = "app-获取合同标签")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppUserTagVO.class)})
+    @GetMapping("getTagIdByUserId")
+    public ResultBody getTagIdByUserId(HttpServletRequest request) {
+        return cooperationService.getTagIdByUserId(this.getUserLoginInfoFromRedis(request).getUserAccountId());
+    }
+
+    @ApiOperation(value = "app-根据tagid获取合同信息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UserApplyTagDO.class)})
+    @GetMapping("getContractNoAndStatus")
+    public ResultBody getContractNoAndStatus(
+            @RequestParam(value = "tagId") Integer tagId,HttpServletRequest request) {
+        return cooperationService.getContractNoAndStatus(tagId, this.getUserLoginInfoFromRedis(request).getUserAccountId());
+    }
+
     @ApiOperation(value = "后台设置小程序用户标签")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("changeUserTag")

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

@@ -6,6 +6,7 @@ import com.mmc.iuav.group.Update;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.controller.BaseController;
 import com.mmc.iuav.user.model.dto.activity.ActivityDTO;
+import com.mmc.iuav.user.model.dto.activity.ActivityPartDTO;
 import com.mmc.iuav.user.model.qo.ActivityQO;
 import com.mmc.iuav.user.model.vo.activity.ActivityVO;
 import com.mmc.iuav.user.service.ActivityService;
@@ -17,7 +18,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
+ * @description: 当前时间只能有一个活动有效，活动requireNum为0时，不限制发放积分人数，人人可以获得积分
  * @author: zj
  * @Date: 2023/10/16 15:06
  */
@@ -66,8 +70,15 @@ public class ActivityController extends BaseController {
     @ApiOperation(value = "活动邀请详情")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("inviteDetail")
-    public ResultBody inviteDetail(@Validated(Page.class) @RequestBody ActivityQO activityQO) {
+    public ResultBody<ActivityPartDTO> inviteDetail(@Validated(Page.class) @RequestBody ActivityQO activityQO) {
         return activityService.inviteDetail(activityQO);
     }
 
+    @ApiOperation(value = "小程序活动详情页-当前正在进行的活动")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("currentActivity")
+    public ResultBody<ActivityDTO> currentActivity(@RequestParam Integer activityType, HttpServletRequest request) {
+        return activityService.currentActivity(activityType, this.getUserLoginInfoFromRedis(request).getUserAccountId());
+    }
+
 }

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

@@ -3,6 +3,7 @@ package com.mmc.iuav.user.controller.wallet;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.controller.BaseController;
 import com.mmc.iuav.user.entity.wallet.UserBillingDetailVO;
+import com.mmc.iuav.user.model.dto.wallet.CashAmountDTO;
 import com.mmc.iuav.user.model.dto.wallet.WithdrawalApplyDTO;
 import com.mmc.iuav.user.model.qo.wallet.WalletFlowQO;
 import com.mmc.iuav.user.model.qo.wallet.WithdrawalApplyQO;
@@ -66,4 +67,12 @@ public class WithdrawalController extends BaseController {
                                              HttpServletRequest request) {
         return ResultBody.success(withdrawalService.approveWithdrawalApply(id, applyStatus, this.getUserLoginInfoFromRedis(request).getUserAccountId(), remark));
     }
+
+    @ApiOperation(value = "获取资金池余额及提现总额")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("getCashAmountAndWithdrawAmount")
+    public ResultBody<CashAmountDTO> getCashAmountAndWithdrawAmount(HttpServletRequest request) {
+        return ResultBody.success(withdrawalService.getCashAmountAndWithdrawAmount(this.getUserLoginInfoFromRedis(request)));
+    }
+
 }

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

@@ -31,7 +31,7 @@ public interface ActivityDao {
 
     ActivityDO currentActivity(Integer activityType);
 
-    int countActivityPart(Integer activityId, Integer userAccountId);
+    int countActivityPart(Integer activityId);
 
     void insertActivityPart(ActivityPartDO activityPartDO);
 

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

@@ -2,8 +2,10 @@ package com.mmc.iuav.user.dao;
 
 import com.mmc.iuav.user.entity.*;
 import com.mmc.iuav.user.model.qo.ApplyQO;
+import com.mmc.iuav.user.model.vo.AppUserTagVO;
 import com.mmc.iuav.user.model.vo.ApplyTagEditVO;
 import com.mmc.iuav.user.model.vo.AttachmentVO;
+import com.mmc.iuav.user.model.vo.UserApplyTagVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -38,6 +40,13 @@ public interface CooperationDao {
     UserApplyTagDO getUserApplyTag(Integer id);
 
     /**
+     * 根据合同编号查询用户
+     * @param contractNo
+     * @return {@link UserApplyTagDO}
+     */
+    UserApplyTagDO getUserApplyTagByContractId(String contractNo);
+
+    /**
      * 修改用户申请
      *
      * @param userApplyTagDO
@@ -85,7 +94,7 @@ public interface CooperationDao {
 
     List<UserApplyTagDO> listUserApplyTag(ApplyQO applyQO);
 
-
+    UserApplyTagDO getContractNoAndStatus(Integer tagId, Integer userAccountId);
     Integer getAuditSum(Integer status);
 
 
@@ -142,6 +151,7 @@ public interface CooperationDao {
 
     UserApplyTagDO appBrandMessage(Integer userAccountId);
 
+    List<AppUserTagVO> getTagIdByUserId(Integer userAccountId);
     int countListCompanyInfoByCoopId(Integer coopId);
 
     List<CompanyInfoDO> listCompanyInfoByCoopId(Integer coopId, Double lon, Double lat, Integer pageNo, Integer pageSize);

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

@@ -200,4 +200,8 @@ public interface UserServiceDao {
     UserAccountMessageVo userMessages(Integer userAccountId);
 
     List<String> userMessagesPilot(Integer pilotId);
+
+    List<UserAccountDO> listAllUserAccountByIds(@Param("userIds") List<Integer> ids);
+
+    int appUserCompanyAuthCount();
 }

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

@@ -9,6 +9,7 @@ import com.mmc.iuav.user.model.qo.wallet.WithdrawalApplyQO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -47,4 +48,6 @@ public interface PayWalletDao {
     List<XzWithdrawalApplyDO> listPageWithdrawalApply(WithdrawalApplyQO param);
 
     int updateWithdrawalApply(XzWithdrawalApplyDO apply);
+
+    BigDecimal getTotalWithdrawAmount();
 }

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

 package com.mmc.iuav.user.entity;
 
+import com.mmc.iuav.user.entity.fdd.ContractInfoDO;
 import com.mmc.iuav.user.model.vo.ApplyTagEditVO;
 import com.mmc.iuav.user.model.vo.AttachmentVO;
 import com.mmc.iuav.user.model.vo.UserApplyTagVO;
@@ -18,7 +19,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class UserApplyTagDO implements Serializable {
+public class  UserApplyTagDO implements Serializable {
     private static final long serialVersionUID = -7581203992821286124L;
     private Integer id;
     private Integer cooperationTagId;
@@ -28,7 +29,9 @@ public class UserApplyTagDO implements Serializable {
     private String remark;
     private Date createTime;
     private Integer applyStatus;
-
+    private String orderNo;
+    private Integer signStatus;
+    private String contractNo;
     /**
      * 辅助字段start
      */
@@ -51,8 +54,10 @@ public class UserApplyTagDO implements Serializable {
                 .applyPhone(this.applyPhone)
                 .remark(this.remark)
                 .applyTime(createTime)
+                .orderNo(orderNo)
                 .approvalStatus(applyStatus)
                 .cooperationTagName(tagName)
+                .signStatus(signStatus)
                 .attachmentList(this.attachmentList)
                 .content(this.companyInfoDO == null ? null : this.companyInfoDO.getContent())
                 .score(this.companyInfoDO == null ? null : this.companyInfoDO.getScore())
@@ -92,7 +97,9 @@ public class UserApplyTagDO implements Serializable {
                 .address(this.companyInfoDO == null ? null : this.companyInfoDO.getAddress())
                 .lat(this.companyInfoDO == null ? null : this.companyInfoDO.getLat())
                 .lon(this.companyInfoDO == null ? null : this.companyInfoDO.getLon())
+                .contractNo(contractNo)
                 .remark(this.remark)
+                .signStatus(signStatus)
                 .build();
     }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/activity/ActivityPartDO.java

@@ -22,9 +22,10 @@ public class ActivityPartDO implements Serializable {
     private Integer userAccountId;
     private Integer pUserAccountId;
     private Date createTime;
+    private Integer rewardValue;
 
     public ActivityPartDTO buildActivityPartDTO() {
         return ActivityPartDTO.builder().id(this.id).activityId(this.activityId).userAccountId(this.userAccountId)
-                .pUserAccountId(this.pUserAccountId).createTime(this.createTime).build();
+                .pUserAccountId(this.pUserAccountId).createTime(this.createTime).rewardValue(this.rewardValue).build();
     }
 }

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

 package com.mmc.iuav.user.service;
 
 import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.model.dto.activity.ActivityDTO;
 import com.mmc.iuav.user.model.qo.ActivityQO;
 import com.mmc.iuav.user.model.vo.activity.ActivityVO;
 
@@ -28,4 +29,6 @@ public interface ActivityService {
     ResultBody delete(Integer id);
 
     ResultBody inviteDetail(ActivityQO activityQO);
+
+    ResultBody<ActivityDTO> currentActivity(Integer activityType, Integer userAccountId);
 }

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

@@ -2,11 +2,10 @@ package com.mmc.iuav.user.service;
 
 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.qo.ApplyQO;
-import com.mmc.iuav.user.model.vo.ApplyTagEditVO;
-import com.mmc.iuav.user.model.vo.CooperationTagVO;
-import com.mmc.iuav.user.model.vo.UserApplyTagVO;
-import com.mmc.iuav.user.model.vo.UserCooperationTagVO;
+import com.mmc.iuav.user.model.qo.CompanyInfoQO;
+import com.mmc.iuav.user.model.vo.*;
 
 import java.util.List;
 
@@ -55,6 +54,9 @@ public interface CooperationService {
 
     ResultBody approvalApplyTag(Integer id, Boolean status);
 
+    ResultBody getTagIdByUserId(Integer userAccountId);
+    ResultBody getContractNoAndStatus(Integer tagId, Integer userAccountId);
+
     ResultBody editUserApplyTag(ApplyTagEditVO applyTagEditVO);
 
     ResultBody editUserApplyTagDetails(Integer id);

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

@@ -93,6 +93,14 @@ public interface UserAccountService {
     List<UserAccountSimpleDTO> feignListUserAccountByIds(List<Integer> ids);
 
     /**
+     * 根据id获取用户信息,包括已删除的
+     *
+     * @param ids
+     * @return
+     */
+    List<UserAccountSimpleDTO> feignListAllUserAccountByIds(List<Integer> ids);
+
+    /**
      * 根据用户id获取推荐人信息
      *
      * @param userIds

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

@@ -77,6 +77,9 @@ public class UserReportServiceImpl implements UserReportService {
     @Override
     public ProductReportDTO getJoinStoreNumber() {
         ProductReportDTO productReportDTO = new ProductReportDTO();
+        // 获取企业认证总数
+        int companyAuthCount = userServiceDao.appUserCompanyAuthCount();
+        productReportDTO.setCompanyAuthCount(companyAuthCount);
         // 获取入驻商家数量
         int joinStoreCount = cooperationDao.getJoinStoreCount();
         productReportDTO.setJoinStoreCount(joinStoreCount);

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

@@ -5,24 +5,38 @@ import com.fadada.sdk.base.client.FddBaseClient;
 import com.fadada.sdk.base.model.req.*;
 import com.fadada.sdk.utils.crypt.FddEncryptTool;
 import com.mmc.iuav.general.CodeUtil;
+import com.mmc.iuav.http.BizException;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.response.ResultEnum;
 import com.mmc.iuav.user.constant.fdd.FddConnectConstant;
 import com.mmc.iuav.user.constant.fdd.FddConstant;
+import com.mmc.iuav.user.dao.CompanyAuthDao;
+import com.mmc.iuav.user.dao.CompanyDao;
+import com.mmc.iuav.user.dao.CooperationDao;
 import com.mmc.iuav.user.dao.UserServiceDao;
 import com.mmc.iuav.user.dao.fdd.ContractDao;
 import com.mmc.iuav.user.dao.fdd.UserFddAuthDao;
+import com.mmc.iuav.user.entity.CompanyAuthDO;
+import com.mmc.iuav.user.entity.CompanyInfoDO;
+import com.mmc.iuav.user.entity.UserApplyTagDO;
 import com.mmc.iuav.user.entity.fdd.ContractInfoDO;
 import com.mmc.iuav.user.entity.fdd.UserFddDO;
+import com.mmc.iuav.user.enums.RoleEnums;
 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 com.mmc.iuav.user.model.vo.BUserAccountVO;
+import com.mmc.iuav.user.model.vo.UserAccountVO;
 import com.mmc.iuav.user.mq.MqProducer;
+import com.mmc.iuav.user.service.BackUserAccountService;
+import com.mmc.iuav.user.service.UserAccountService;
 import com.mmc.iuav.user.service.fdd.ContractService;
 import com.mmc.iuav.user.service.fdd.SealManageService;
 import com.mmc.iuav.user.service.fdd.UserFddAuthService;
+import com.mmc.iuav.user.util.SmsUtil;
 import com.mmc.iuav.user.util.TDateUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -53,6 +67,20 @@ public class ContractServiceImpl implements ContractService {
     @Resource
     UserFddAuthDao userFddAuthDao;
 
+    @Autowired
+    private BackUserAccountService backUserAccountService;
+
+    @Autowired
+    private UserAccountService userAccountService;
+
+    @Autowired
+    private CompanyDao companyDao;
+
+    @Autowired
+    private CompanyAuthDao companyAuthDao;
+    @Autowired
+    private CooperationDao cooperationDao;
+
     /**
      * 上传合同
      *
@@ -206,6 +234,8 @@ public class ContractServiceImpl implements ContractService {
         }
         // 获取合同信息
         ContractInfoDO contractInfoDO = contractDao.contractInfoByOrderNo(null, contractId);
+        log.info(contractInfoDO.toString());
+        String orderNo = contractInfoDO.getOrderNo();
         ContractInfoDO updateSignStatus = new ContractInfoDO();
         updateSignStatus.setContractNo(contractId);
         if (contractInfoDO.getSignStatus() == 0 && FddConstant.SIGN_SUCCESS.equals(resultCode) && contractInfoDO.getATransactionId().equals(transactionId)) {
@@ -218,18 +248,38 @@ public class ContractServiceImpl implements ContractService {
             updateSignStatus.setBRemark(resultDesc);
         } else if (contractInfoDO.getSignStatus() == 2 && FddConstant.SIGN_SUCCESS.equals(resultCode) && contractInfoDO.getBTransactionId().equals(transactionId)) {
             // 乙方公司签章成功
+            log.info("成功进入");
             updateSignStatus.setSignStatus(4);
             updateSignStatus.setBRemark(resultDesc);
             updateSignStatus.setSingerTime(new Date());
+
+            if(orderNo.startsWith(FddConstant.FN)) {
+                // 乙方生成后台对应的账号
+                UserApplyTagDO userApplyTag = cooperationDao.getUserApplyTagByContractId(contractId);
+                BUserAccountVO bUserAccountVO = this.generateBackUserAccountVO(userApplyTag);
+                log.info("check apply cooperation tag, bUserAccountVO:{}", com.alibaba.fastjson2.JSONObject.toJSONString(bUserAccountVO));
+                ResultBody resultBody = backUserAccountService.insertBAccount(bUserAccountVO, null);
+                log.info(resultBody.toString());
+                if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
+                    // 生成账号失败处理
+                    log.info("生成失败");
+                    throw new BizException(ResultEnum.COOPERATION_CHECK_NOT_PASS_ERROR);
+                }
+                SmsUtil.sendPassCooperationApply(bUserAccountVO.getPhoneNum());
+            }
             // 同步订单状态
             ContractInfoDTO contractInfoDTO = contractInfoDO.buildContractInfoDTO();
             contractInfoDTO.setSignStatus(4);
+            log.info("到达mq");
+            log.info("到达mq");
             mqProducer.sentFinishOrderSign(contractInfoDTO);
         } else if (contractInfoDO.getSignStatus() == 2 && FddConstant.SIGN_FAIL.equals(resultCode) && contractInfoDO.getBTransactionId().equals(transactionId)) {
             // 乙方公司签章失败
             updateSignStatus.setSignStatus(3);
             updateSignStatus.setBRemark(resultDesc);
         }
+        log.info(updateSignStatus.toString());
+        log.info(updateSignStatus.toString());
         contractDao.updateContractInfo(updateSignStatus);
         return ResultBody.success();
     }
@@ -267,4 +317,50 @@ public class ContractServiceImpl implements ContractService {
         List<ContractInfoDO> contractInfoDOList = contractDao.listContractInfoByOrderNo(orderNos);
         return contractInfoDOList == null ? null : contractInfoDOList.stream().map(ContractInfoDO::buildContractInfoDTO).collect(Collectors.toList());
     }
+
+
+    private BUserAccountVO generateBackUserAccountVO(UserApplyTagDO userApplyTagDO) {
+        BUserAccountVO bUserAccountVO = new BUserAccountVO();
+        UserAccountVO userAccountVO = userAccountService.getUserAccountById(userApplyTagDO.getUserAccountId());
+        bUserAccountVO.setAccountNo(userAccountVO.getPhoneNum());
+        bUserAccountVO.setUserName(userApplyTagDO.getApplyName());
+        bUserAccountVO.setPhoneNum(userAccountVO.getPhoneNum());
+        // String password = "YXF123456";
+        bUserAccountVO.setPassWord(userAccountVO.getPhoneNum());
+        bUserAccountVO.setAlertPwd(userAccountVO.getPhoneNum());
+        bUserAccountVO.setAccountStatus(1);
+        // 根据加盟类型分配角色
+        if (userApplyTagDO.getCooperationTagId().equals(3)) {
+            bUserAccountVO.setRoleId(RoleEnums.LEASE_FRANCHISEE.getId());
+        } else if (userApplyTagDO.getCooperationTagId().equals(5)) {
+            bUserAccountVO.setRoleId(RoleEnums.SERVICE_FRANCHISEE.getId());
+        } else {
+            bUserAccountVO.setRoleId(RoleEnums.FRANCHISEE.getId());
+        }
+        // 添加单位id
+        CompanyInfoDO companyInfo = this.getCompanyInfo(userApplyTagDO);
+        bUserAccountVO.setCompanyId(companyInfo.getId());
+        bUserAccountVO.setRemark("加盟商自动生成");
+        return bUserAccountVO;
+    }
+
+    private CompanyInfoDO getCompanyInfo(UserApplyTagDO userApplyTagDO) {
+        // 查询小程序用户认证单位信息
+        CompanyAuthDO companyAuth = companyAuthDao.getCompanyAuth(userApplyTagDO.getUserAccountId());
+        // 验证是否已经添加单位信息
+        CompanyInfoDO existCompanyInfo = companyDao.getCompanyInfoByName(companyAuth.getCompanyName());
+        // 添加单位信息
+        if (existCompanyInfo == null) {
+            CompanyInfoDO companyInfoDO = new CompanyInfoDO();
+            companyInfoDO.setCompanyType(1);
+            companyInfoDO.setCompanyName(companyAuth.getCompanyName());
+            companyInfoDO.setFullName(companyAuth.getCompanyName());
+            companyInfoDO.setCompanyUserName(userApplyTagDO.getApplyName());
+            companyInfoDO.setPhoneNum(userApplyTagDO.getApplyPhone());
+            companyDao.addCompanyInfo(companyInfoDO);
+            return companyInfoDO;
+        } else {
+            return existCompanyInfo;
+        }
+    }
 }

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

@@ -111,7 +111,7 @@ public class UserFddAuthServiceImpl implements UserFddAuthService {
 //        params.setBankCardNo(""); //个人银行卡
 //        params.setOption(""); //不传默认add
 //        params.setIdPhotoOptional(""); //是否需要上传身份照片
-//        params.setIsMinProgram(""); //是否跳转法大大公证处小程序认证
+        params.setIsMinProgram("3"); //是否跳转法大大公证处小程序认证
 //        params.setLang("zh"); //zh：中文；en：英文
 //        params.setIsAllowOverseasBankCardAuth(""); //海外用户是否支持银行卡认证
 //        params.setIdentFrontImg(new File("")); //证件正面照图片文件

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

 package com.mmc.iuav.user.service.impl;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.mmc.iuav.page.PageResult;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.dao.ActivityDao;
@@ -20,7 +21,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -103,18 +103,22 @@ public class ActivityServiceImpl implements ActivityService {
             return ResultBody.success();
         }
         // 查询是否超过奖励限制
-        int count = activityDao.countActivityPart(activityDO.getId(), userAccountId);
+        int count = activityDao.countActivityPart(activityDO.getId());
         if (activityDO.getRequireNum() == 0 || count < activityDO.getRequireNum()) {
+            log.info("Activity invite award! userAccountId:{}", userAccountId);
             // 暂时只奖励积分
             ChangeUserPointVO changePoint = new ChangeUserPointVO();
             changePoint.setUserAccountId(userAccountId);
             changePoint.setChangePoint(activityDO.getRewardValue());
             changePoint.setChangeType(7);
             userPointsService.change(changePoint);
+            // 记录领取信息（被邀请）
+            ActivityPartDO activityPartDO = new ActivityPartDO();
+            activityPartDO.setActivityId(activityDO.getId());
+            activityPartDO.setUserAccountId(userAccountId);
+            activityPartDO.setPUserAccountId(pUserAccountId);
+            activityDao.insertActivityPart(activityPartDO);
         }
-        // 记录领取信息（被邀请）
-        ActivityPartDO activityPartDO = new ActivityPartDO(null, activityDO.getId(), userAccountId, pUserAccountId, new Date());
-        activityDao.insertActivityPart(activityPartDO);
         return ResultBody.success();
     }
 
@@ -126,6 +130,7 @@ public class ActivityServiceImpl implements ActivityService {
 
     @Override
     public ResultBody inviteDetail(ActivityQO activityQO) {
+        log.info("InviteDetail parameter:{}", JSONObject.toJSONString(activityQO));
         int count = activityDao.countActivityPartDetail(activityQO);
         if (count == 0) {
             return ResultBody.success(PageResult.buildPage(activityQO.getPageNo(), activityQO.getPageSize(), count));
@@ -133,13 +138,36 @@ public class ActivityServiceImpl implements ActivityService {
         Integer pageNo = activityQO.getPageNo();
         activityQO.buildCurrentPage();
         List<ActivityPartDO> activityPartDOS = activityDao.activityPartDetail(activityQO);
+        List<ActivityPartDTO> activityPartDTOS = this.buildActivityPartDTOS(activityPartDOS);
+        return ResultBody.success(PageResult.buildPage(pageNo, activityQO.getPageSize(), count, activityPartDTOS));
+    }
+
+    @Override
+    public ResultBody<ActivityDTO> currentActivity(Integer activityType, Integer userAccountId) {
+        ActivityDO activityDO = activityDao.currentActivity(activityType);
+        if (activityDO == null) {
+            return ResultBody.success();
+        }
+        ActivityDTO activityDTO = activityDO.buildActivityDTO();
+        ActivityQO activityQO = new ActivityQO();
+        activityQO.setActivityId(activityDO.getId());
+        activityQO.setUserAccountId(userAccountId);
+        activityQO.setPageNo(0);
+        activityQO.setPageSize(999999);
+        List<ActivityPartDO> activityPartDOS = activityDao.activityPartDetail(activityQO);
+        List<ActivityPartDTO> activityPartDTOList = this.buildActivityPartDTOS(activityPartDOS);
+        activityDTO.setActivityPartDTOS(activityPartDTOList);
+        return ResultBody.success(activityDTO);
+    }
+
+    public List<ActivityPartDTO> buildActivityPartDTOS(List<ActivityPartDO> activityPartDOS) {
         List<ActivityPartDTO> activityPartDTOS = activityPartDOS.stream().map(ActivityPartDO::buildActivityPartDTO).collect(Collectors.toList());
         // 邀请人id
         List<Integer> userIds = activityPartDTOS.stream().map(ActivityPartDTO::getUserAccountId).collect(Collectors.toList());
         // 被邀请人id
         List<Integer> pUserIds = activityPartDTOS.stream().map(ActivityPartDTO::getPUserAccountId).collect(Collectors.toList());
-        List<UserAccountSimpleDTO> userAccountSimpleDTOS = userAccountService.feignListUserAccountByIds(userIds);
-        List<UserAccountSimpleDTO> pUserAccountDTOS = userAccountService.feignListUserAccountByIds(pUserIds);
+        List<UserAccountSimpleDTO> userAccountSimpleDTOS = userAccountService.feignListAllUserAccountByIds(userIds);
+        List<UserAccountSimpleDTO> pUserAccountDTOS = userAccountService.feignListAllUserAccountByIds(pUserIds);
         if (!CollectionUtils.isEmpty(userAccountSimpleDTOS)) {
             Map<Integer, UserAccountSimpleDTO> userMap = userAccountSimpleDTOS.stream().collect(Collectors.toMap(UserAccountSimpleDTO::getId, k1 -> k1, (k1, k2) -> k2));
             for (ActivityPartDTO activityPartDTO : activityPartDTOS) {
@@ -152,6 +180,6 @@ public class ActivityServiceImpl implements ActivityService {
                 activityPartDTO.setPAccountSimpleDTO(pUserMap.get(activityPartDTO.getPUserAccountId()));
             }
         }
-        return ResultBody.success(PageResult.buildPage(pageNo, activityQO.getPageSize(), count, activityPartDTOS));
+        return activityPartDTOS;
     }
 }

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

@@ -2,15 +2,18 @@ package com.mmc.iuav.user.service.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
+import com.mmc.iuav.general.CodeUtil;
 import com.mmc.iuav.http.BizException;
 import com.mmc.iuav.page.PageResult;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.response.ResultEnum;
+import com.mmc.iuav.user.constant.fdd.FddConstant;
 import com.mmc.iuav.user.dao.CompanyAuthDao;
 import com.mmc.iuav.user.dao.CompanyDao;
 import com.mmc.iuav.user.dao.CooperationDao;
 import com.mmc.iuav.user.entity.*;
 import com.mmc.iuav.user.enums.RoleEnums;
+import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.dto.WebsiteRangeDTO;
 import com.mmc.iuav.user.model.qo.ApplyQO;
 import com.mmc.iuav.user.model.vo.*;
@@ -19,6 +22,7 @@ import com.mmc.iuav.user.service.CooperationService;
 import com.mmc.iuav.user.service.UserAccountService;
 import com.mmc.iuav.user.util.LocationUtils;
 import com.mmc.iuav.user.util.SmsUtil;
+import com.mmc.iuav.user.util.TDateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -85,6 +89,9 @@ public class CooperationServiceImpl implements CooperationService {
             }
         }
         UserApplyTagDO userApplyTagDO = new UserApplyTagDO(userApplyTagVO);
+        //自定义订单 加盟订单编号设置规则：FN + 年份 + 8位随机数
+        String orderNo = FddConstant.FN + TDateUtil.getCurrentYear() + CodeUtil.getRandomNum(8);
+        userApplyTagDO.setOrderNo(orderNo);
         cooperationDao.addApply(userApplyTagDO);
         List<AttachmentVO> attachmentList = userApplyTagVO.getAttachmentList();
         if (!CollectionUtils.isEmpty(attachmentList)) {
@@ -181,6 +188,7 @@ public class CooperationServiceImpl implements CooperationService {
         userApplyTagDetailsVO.setLicenseImg(companyInfoDO.getLicenseImg());
         userApplyTagDetailsVO.setCreditCode(companyInfoDO.getCreditCode());
         userApplyTagDetailsVO.setRemark(userApplyTag.getRemark());
+        userApplyTagDetailsVO.setOrderNo(userApplyTag.getOrderNo());
         return ResultBody.success(userApplyTagDetailsVO);
     }
 
@@ -202,15 +210,6 @@ public class CooperationServiceImpl implements CooperationService {
                 userTagDO.setCooperationTagId(userApplyTag.getCooperationTagId());
                 cooperationDao.insertUserTag(userTagDO);
             }
-            // 审批通过生成后台对应的账号
-            BUserAccountVO bUserAccountVO = this.generateBackUserAccountVO(userApplyTag);
-            log.info("check apply cooperation tag, bUserAccountVO:{}", JSONObject.toJSONString(bUserAccountVO));
-            ResultBody resultBody = backUserAccountService.insertBAccount(bUserAccountVO, null);
-            if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
-                // 生成账号失败处理
-                throw new BizException(ResultEnum.COOPERATION_CHECK_NOT_PASS_ERROR);
-            }
-            SmsUtil.sendPassCooperationApply(bUserAccountVO.getPhoneNum());
         } else {
             SmsUtil.sendNotPassCooperationApply(account.getPhoneNum());
             cooperationDao.updateApplyTagStatus(id, 2);
@@ -218,6 +217,18 @@ public class CooperationServiceImpl implements CooperationService {
         return ResultBody.success();
     }
 
+    @Override
+    public ResultBody getTagIdByUserId(Integer userAccountId) {
+        List<AppUserTagVO> tagIdByUserId = cooperationDao.getTagIdByUserId(userAccountId);
+        return ResultBody.success(tagIdByUserId);
+    }
+
+    @Override
+    public ResultBody getContractNoAndStatus(Integer tagId, Integer userAccountId) {
+        UserApplyTagDO userApplyTagDO = cooperationDao.getContractNoAndStatus(tagId, userAccountId);
+        return ResultBody.success(userApplyTagDO);
+    }
+
     private BUserAccountVO generateBackUserAccountVO(UserApplyTagDO userApplyTagDO) {
         BUserAccountVO bUserAccountVO = new BUserAccountVO();
         UserAccountVO userAccountVO = userAccountService.getUserAccountById(userApplyTagDO.getUserAccountId());

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

@@ -230,7 +230,7 @@ public class UserAccountServiceImpl implements UserAccountService {
             return ResultBody.success();
         }
         String userPhoneNumber = wxService.getUserPhoneNumber(id, code);
-        log.info("授权手机号，用户：{}，手机号：{}", id, userPhoneNumber);
+        log.info("授权手机号，用户：{}，手机号：{}，上级推荐人:{}", id, userPhoneNumber, rcdUserId);
         if (StringUtils.isBlank(userPhoneNumber)) {
             return ResultBody.error(ResultEnum.AUTH_PHONE_NUMBER_ERROR);
         }
@@ -313,6 +313,18 @@ public class UserAccountServiceImpl implements UserAccountService {
     }
 
     @Override
+    public List<UserAccountSimpleDTO> feignListAllUserAccountByIds(List<Integer> ids) {
+        List<UserAccountDO> userAccountDOS = userServiceDao.listAllUserAccountByIds(ids);
+        if (!CollectionUtils.isEmpty(userAccountDOS)) {
+            List<UserAccountSimpleDTO> userAccountSimpleDTOS = userAccountDOS.stream().map(UserAccountDO::buildUserAccountSimpleDTO).collect(Collectors.toList());
+            //设置用户的渠道等级
+            buildCooperationTagVO(userAccountSimpleDTOS);
+            return userAccountSimpleDTOS;
+        }
+        return null;
+    }
+
+    @Override
     public List<UserAccountSimpleDTO> feignListRcdUserInfo(List<Integer> userIds) {
         List<UserAccountDO> userAccountDOS = userServiceDao.feignListRcdUserInfo(userIds);
         if (!CollectionUtils.isEmpty(userAccountDOS)) {

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

@@ -2,6 +2,8 @@ package com.mmc.iuav.user.service.xzsz;
 
 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.dto.wallet.CashAmountDTO;
 import com.mmc.iuav.user.model.qo.wallet.WalletFlowQO;
 import com.mmc.iuav.user.model.qo.wallet.WithdrawalApplyQO;
 import com.mmc.iuav.user.model.vo.wallet.ApplyWithdrawalVO;
@@ -18,4 +20,6 @@ public interface WithdrawalService {
     PageResult listPageWithdrawalApply(WithdrawalApplyQO param);
 
     ResultBody approveWithdrawalApply(Integer id, Integer applyStatus, Integer userAccountId, String remark);
+
+    CashAmountDTO getCashAmountAndWithdrawAmount(LoginSuccessDTO loginSuccessDTO);
 }

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

 package com.mmc.iuav.user.service.xzsz.impl;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.mmc.iuav.general.CodeUtil;
 import com.mmc.iuav.page.PageResult;
 import com.mmc.iuav.response.ResultBody;
@@ -16,7 +17,10 @@ import com.mmc.iuav.user.entity.wallet.WithdrawalLogDO;
 import com.mmc.iuav.user.enums.WithdrawalApplyStatus;
 import com.mmc.iuav.user.enums.WithdrawalMethod;
 import com.mmc.iuav.user.enums.XzEnums;
+import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
+import com.mmc.iuav.user.model.dto.wallet.CashAmountDTO;
 import com.mmc.iuav.user.model.dto.wallet.WithdrawalApplyDTO;
+import com.mmc.iuav.user.model.dto.xzsz.CashPoolingDTO;
 import com.mmc.iuav.user.model.qo.wallet.WalletFlowQO;
 import com.mmc.iuav.user.model.qo.wallet.WithdrawalApplyQO;
 import com.mmc.iuav.user.model.vo.XzWithdrawalVO;
@@ -255,4 +259,19 @@ public class WithdrawalServiceImpl implements WithdrawalService {
         payWalletDO.setWdlFreeze(wallet.getWdlFreeze().subtract(BigDecimal.valueOf(applyInfo.getPayAmount())));
         return payWalletDao.updatePayWallet(payWalletDO);
     }
+
+    @Override
+    public CashAmountDTO getCashAmountAndWithdrawAmount(LoginSuccessDTO loginSuccessDTO) {
+        if (!loginSuccessDTO.getRoleInfo().getSuperAdmin().equals(1)) {
+            return null;
+        }
+        CashAmountDTO cashAmountDTO = new CashAmountDTO();
+        BigDecimal totalWithdrawAmount = payWalletDao.getTotalWithdrawAmount();
+        cashAmountDTO.setTotalWithdrawAmt(totalWithdrawAmount);
+        ResultBody cashPooling = xzService.getCashPooling();
+        String s = JSONObject.toJSONString(cashPooling.getResult());
+        CashPoolingDTO cashPoolingDTO = JSONObject.parseObject(s, CashPoolingDTO.class);
+        cashAmountDTO.setCashPoolAmount(cashPoolingDTO.getAvailableBalance());
+        return cashAmountDTO;
+    }
 }

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

@@ -15,6 +15,9 @@
         <result property="remark" column="remark"/>
         <result property="createTime" column="create_time"/>
         <result property="tagName" column="tag_name"/>
+        <result property="orderNo" column="order_no"/>
+        <result property="signStatus" column="sign_status"/>
+        <result property="contractNo" column="contract_no"/>
 
         <association property="companyInfoDO" javaType="com.mmc.iuav.user.entity.CompanyInfoDO">
             <id property="id" column="company_info_id"/>
@@ -38,8 +41,8 @@
 
     <insert id="addApply" parameterType="com.mmc.iuav.user.entity.UserApplyTagDO" useGeneratedKeys="true"
             keyProperty="id">
-        insert into user_apply_tag(cooperation_tag_id, user_account_id, apply_name, apply_phone, remark, create_time)
-        values (#{cooperationTagId}, #{userAccountId}, #{applyName}, #{applyPhone}, #{remark}, NOW())
+        insert into user_apply_tag(cooperation_tag_id, user_account_id, apply_name, apply_phone, remark, create_time,order_no)
+        values (#{cooperationTagId}, #{userAccountId}, #{applyName}, #{applyPhone}, #{remark}, NOW(),#{orderNo})
     </insert>
 
     <insert id="insertUserTag" useGeneratedKeys="true" parameterType="com.mmc.iuav.user.entity.UserTagDO"
@@ -151,6 +154,7 @@
                ua.apply_status,
                ua.remark,
                ua.create_time,
+               ua.order_no,
                ct.tag_name,
                ci.id AS company_info_id,
                ci.company_name,
@@ -162,15 +166,48 @@
                ci.lat,
                ci.lon,
                ci.content,
-               ci.score
+               ci.score,
+        cti.contract_no,
+        cti.sign_status
         FROM user_apply_tag ua
                  INNER JOIN cooperation_tag ct ON ua.cooperation_tag_id = ct.id
                  INNER JOIN company_member cm ON cm.user_account_id = ua.user_account_id
                  INNER JOIN company_info ci ON cm.company_info_id = ci.id
+                left join contract_info cti on ua.order_no = cti.order_no
         WHERE ua.id = #{id}
           AND ua.is_deleted = 0
     </select>
 
+    <select id="getUserApplyTagByContractId" resultType="com.mmc.iuav.user.entity.UserApplyTagDO">
+        SELECT ua.id,
+               ua.cooperation_tag_id,
+               ua.user_account_id,
+               ua.apply_name,
+               ua.apply_phone,
+               ua.apply_status,
+               ua.remark,
+               ua.create_time,
+               ct.tag_name,
+               ci.id AS company_info_id,
+               ci.company_name,
+               ci.brand_name,
+               ci.brand_logo,
+               ci.credit_code,
+               ci.license_img,
+               ci.address,
+               ci.lat,
+               ci.lon,
+               ci.content,
+               ci.score
+        FROM user_apply_tag ua
+                 INNER JOIN cooperation_tag ct ON ua.cooperation_tag_id = ct.id
+                 INNER JOIN company_member cm ON cm.user_account_id = ua.user_account_id
+                 INNER JOIN company_info ci ON cm.company_info_id = ci.id
+                INNER JOIN contract_info cti on cti.order_no = ua.order_no
+        WHERE cti.contract_no = #{contractNo}
+          AND ua.is_deleted = 0
+    </select>
+
     <select id="listUserCooperationTag" resultType="com.mmc.iuav.user.entity.CooperationTagDO">
         select ct.id, ct.tag_name
         from cooperation_tag ct
@@ -223,6 +260,7 @@
         ua.apply_phone,
         ua.apply_status,
         ua.remark,
+        ua.order_no,
         ua.create_time,
         ct.tag_name,
         ci.id as company_info_id,
@@ -235,12 +273,14 @@
         ci.lat,
         ci.lon,
         ci.content,
-        ci.score
+        ci.score,
+        cti.sign_status
         FROM
         user_apply_tag ua
         INNER JOIN cooperation_tag ct ON ua.cooperation_tag_id = ct.id
         INNER JOIN company_member cm ON cm.user_account_id = ua.user_account_id
         INNER JOIN company_info ci ON cm.company_info_id = ci.id
+        left join contract_info cti on ua.order_no = cti.order_no
         <where>
             ua.is_deleted = 0
             <if test="cooperationTagId != null">
@@ -262,6 +302,46 @@
         order by ua.create_time desc
         limit #{pageNo},#{pageSize}
     </select>
+
+    <select id="getContractNoAndStatus"  resultMap="UserApplyTagResultMap">
+        SELECT ua.id,
+        ua.apply_name,
+        ua.apply_phone,
+        ua.apply_status,
+        ua.remark,
+        ua.create_time,
+        ua.order_no,
+        ct.tag_name,
+        ci.id AS company_info_id,
+        ci.company_name,
+        ci.brand_name,
+        ci.brand_logo,
+        ci.credit_code,
+        ci.license_img,
+        ci.address,
+        ci.lat,
+        ci.lon,
+        ci.content,
+        ci.score,
+        cti.contract_no,
+        cti.sign_status
+        FROM user_apply_tag ua
+        INNER JOIN cooperation_tag ct ON ua.cooperation_tag_id = ct.id
+        INNER JOIN company_member cm ON cm.user_account_id = ua.user_account_id
+        INNER JOIN company_info ci ON cm.company_info_id = ci.id
+        left join contract_info cti on ua.order_no = cti.order_no
+        <where>
+            ua.is_deleted = 0
+        <if test="tagId != null">
+            and ua.cooperation_tag_id = #{tagId}
+        </if>
+            <if test="userAccountId != null">
+                and ua.user_account_id = #{userAccountId}
+            </if>
+        </where>
+    </select>
+
+
     <select id="getAuditSum" resultType="java.lang.Integer">
         SELECT count(*)
         FROM
@@ -442,6 +522,8 @@
           AND ci.is_deleted = 0
     </select>
 
+
+
     <select id="countListCompanyInfoByCoopId" resultType="java.lang.Integer">
         SELECT count(*)
         FROM user_apply_tag uat
@@ -497,4 +579,11 @@
           and ua.cooperation_tag_id = #{type}
           and ua.apply_status = 1
     </select>
+    <select id="getTagIdByUserId" resultType="com.mmc.iuav.user.model.vo.AppUserTagVO">
+        select cooperation_tag_id,tag_name
+        from user_apply_tag ua
+                 inner join cooperation_tag ct on ua.cooperation_tag_id = ct.id
+        where ua.is_deleted = 0 and ct.is_deleted = 0
+          and ua.user_account_id = #{userAccountId}
+    </select>
 </mapper>

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

@@ -613,28 +613,45 @@
     </select>
 
     <select id="userMessages" resultType="com.mmc.iuav.user.model.vo.UserAccountMessageVo">
-        SELECT
-            rna.user_account_id as userAccountId,
-            rna.sex,
-            (
-                YEAR (
-                CURDATE())- YEAR ( birthday )) AS birthday,
-            pc.id as pilotId,
-            pc.years_of_working
-        FROM
-            real_name_auth rna
-                INNER JOIN pilot_certification pc ON rna.user_account_id = pc.user_account_id
-        WHERE
-            rna.user_account_id = #{userAccountId}
+        SELECT rna.user_account_id              as userAccountId,
+               rna.sex,
+               (
+                   YEAR (
+                   CURDATE())- YEAR (birthday)) AS birthday,
+               pc.id                            as pilotId,
+               pc.years_of_working
+        FROM real_name_auth rna
+                 INNER JOIN pilot_certification pc ON rna.user_account_id = pc.user_account_id
+        WHERE rna.user_account_id = #{userAccountId}
     </select>
 
     <select id="userMessagesPilot" resultType="java.lang.String">
-        SELECT
-            ability_name
-        FROM
-            pilot_ability_certification pac
-        WHERE
-            pilot_certification_id = #{pilotId}
+        SELECT ability_name
+        FROM pilot_ability_certification pac
+        WHERE pilot_certification_id = #{pilotId}
+    </select>
+    <select id="appUserCompanyAuthCount" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM user_account ua
+                 LEFT JOIN company_member cm ON cm.user_account_id = ua.id
+                 LEFT JOIN company_info ci ON ci.id = cm.company_info_id AND ci.is_deleted = 0
+        WHERE ua.`disable` = 0
+          AND ua.port_type = 100
+          AND cm.is_leader = 1
+    </select>
+
+    <select id="listAllUserAccountByIds" resultType="com.mmc.iuav.user.entity.UserAccountDO">
+        select ua.id, ua.phone_num, ua.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,
+        ca.company_name
+        from user_account ua left join company_auth ca on ua.id = ca.user_account_id
+        where 1 = 1
+        <if test=" userIds != null ">
+            <foreach collection="userIds" item="id" open="and ua.id in (" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
     </select>
 
 </mapper>

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

@@ -89,6 +89,9 @@
             parameterType="com.mmc.iuav.user.model.qo.ActivityQO">
         select count(*) from activity
         where is_deleted = 0
+        <if test="activityName != null">
+            and activity_name like CONCAT("%",#{activityName},"%")
+        </if>
         <if test="activityType != null">
             and activity_type = #{activityType}
         </if>
@@ -102,6 +105,9 @@
         <include refid="activity_column"/>
         from activity ac
         where ac.is_deleted = 0
+        <if test="activityName != null">
+            and ac.activity_name like CONCAT("%",#{activityName},"%")
+        </if>
         <if test="activityType != null">
             and ac.activity_type = #{activityType}
         </if>
@@ -116,11 +122,12 @@
             parameterType="com.mmc.iuav.user.entity.activity.ActivityDO">
         select count(*) from activity ac
         where ac.is_deleted = 0 and ac.activity_status = 1
-        <if test="startTime != null">
-            and ( #{startTime} >= ac.start_time and ac.end_time >= #{startTime} )
+        <if test="id != null">
+            and ac.id != #{id}
         </if>
-        <if test="endTime != null">
-            and ( #{endTime} >= ac.start_time and ac.end_time >= #{endTime} )
+        <if test="startTime != null">
+            and ( ( #{startTime} >= ac.start_time and ac.end_time >= #{startTime} ) or ( #{endTime} >= ac.start_time and
+            ac.end_time >= #{endTime} ) )
         </if>
     </select>
 
@@ -140,14 +147,14 @@
         select
         <include refid="activity_column"/>
         from activity ac
-        where ac.is_deleted = 0 and ac.activity_status = 0 and ( NOW() >= ac.start_time and ac.end_time >= NOW() ) and
+        where ac.is_deleted = 0 and ac.activity_status = 1 and ( NOW() >= ac.start_time and ac.end_time >= NOW() ) and
         ac.activity_type =
         #{activityType}
     </select>
 
     <select id="countActivityPart" resultType="java.lang.Integer">
         select count(*) from activity ac inner join activity_part acp on ac.id = acp.activity_id
-         where acp.activity_id = #{activityId} and acp.user_account_id = #{userAccountId}
+         where acp.activity_id = #{activityId}
     </select>
 
     <select id="activityPartDetail" resultType="com.mmc.iuav.user.entity.activity.ActivityPartDO"
@@ -155,6 +162,9 @@
         select<include refid="activity_part_column"/>, ac.reward_value
         from activity_part ap inner join activity ac on ap.activity_id = ac.id
         where ac.id = #{activityId}
+        <if test="userAccountId != null">
+            and ap.user_account_id = #{userAccountId}
+        </if>
         order by ap.id desc
         limit #{pageNo}, #{pageSize}
     </select>
@@ -164,5 +174,8 @@
         select count(*)
         from activity_part ap inner join activity ac on ap.activity_id = ac.id
         where ac.id = #{activityId}
+        <if test="userAccountId != null">
+            and ap.user_account_id = #{userAccountId}
+        </if>
     </select>
 </mapper>
\ No newline at end of file

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

@@ -411,4 +411,8 @@
         order by create_time desc
         limit #{pageNo},#{pageSize}
     </select>
+    <select id="getTotalWithdrawAmount" resultType="java.math.BigDecimal">
+        select sum(salary_wdl)
+        from pay_wallet
+    </select>
 </mapper>

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: ece705d2213818f5dc95d4c035aedb0015e1b0ce
+  newTag: 24412eb1f589c5be825ed5c7b696f5cb5fdbf4f4