Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/config/DataPermissionInterceptor.java

@@ -1,6 +1,8 @@
 package com.jzg.commons.config;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.extension.plugins.handler.MultiDataPermissionHandler;
 import com.jzg.commons.constants.SystemConstants;
 import com.jzg.commons.core.base.BaseController;
@@ -19,6 +21,8 @@ import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.redisson.api.RedissonClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
 
 import java.io.Serial;
@@ -34,6 +38,8 @@ import java.util.*;
 })
 public class DataPermissionInterceptor implements MultiDataPermissionHandler {
 
+    private static final Logger log = LoggerFactory.getLogger(DataPermissionInterceptor.class);
+
     private List<String> ignoredTables;
 
     private DataScopeProperties dataScopeProperties;
@@ -105,6 +111,7 @@ public class DataPermissionInterceptor implements MultiDataPermissionHandler {
         StringBuilder additionalSql = new StringBuilder();
         String tableName = getTableName(table);
         if(shouldIgnoreTable(table.getName()) && !dataScope.isEmpty()) {
+            log.info("{}函数进入dept过滤",table.getName());
             String fieldName = table.getName().equals("sys_dept") ? "id" : "dept_id";
             tableName = getAliasName(table);
             List<String> deptIds = new ArrayList<>();

commons/src/main/java/com/jzg/commons/constants/SystemBusPermsConstants.java

@@ -14,7 +14,8 @@ public enum SystemBusPermsConstants {
     ORDER_AUDIT_DEPT_BUS(2,"orderAuditDept","订单审核机构"),
     SALESMAN_AUDIT_DEPT(3,"salesmanAuditDept","业务员审核机构"),
     SALESMAN_WITHDRAW_ACCOUNT_AUDIT_DEPT(4,"salesmanWithdrawAccountAuditDept","业务员提现账号审核机构"),
-    SALESMAN_WITHDRAW_PAYMENT_AUDIT_DEPT(5,"salesmanWithdrawPaymentAuditDept","业务员提现申请付款审核机构");
+    SALESMAN_WITHDRAW_PAYMENT_AUDIT_DEPT(5,"salesmanWithdrawPaymentAuditDept","业务员提现申请付款审核机构"),
+    AccountLinking(6,"accountLinking","账号互通");
 
     private Integer id;
     private String code;

commons/src/main/java/com/jzg/commons/entity/rights/dto/InsOrderRightsDto.java

@@ -1,11 +1,14 @@
 package com.jzg.commons.entity.rights.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 类描述：
@@ -17,6 +20,10 @@ import java.util.Date;
 @Schema(description = "订单选择权益券DTO")
 @Data
 public class InsOrderRightsDto {
+
+    @Schema(description = "权益类型 1 券  2 套餐")
+    private String rightType;
+
     @Schema(description = "权益券id:对应生活服务平台返回的id")
     private String rightsId;
 
@@ -99,4 +106,59 @@ public class InsOrderRightsDto {
 
     @Schema(description = "权益类型：1-权益")
     private Integer rightsType;
+
+    //    @Schema(description = "权益套餐id")
+//    private String rightsPackageId;
+    @Schema(description = "权益套餐名称")
+    private String equityPackageName;
+
+    /**费用最大值*/
+    @Schema(description = "费用最大值")
+    private BigDecimal costPriceMax;
+    /**费用最小值*/
+    @Schema(description = "费用最小值")
+    private BigDecimal costPriceMin;
+
+
+    /**协议价*/
+    @Schema(description= "协议价")
+    private BigDecimal agreementPrice;
+    /**三方结算价*/
+    @Schema(description = "三方结算价")
+    private BigDecimal threeSettlementPrice;
+
+    /**套餐售价*/
+    @Schema(description = "套餐售价")
+    private BigDecimal packagePrice;
+    /**行业id*/
+    @Schema(description = "行业id")
+    private String industryId;
+
+    /**是否上架(0 未上架  1  上架)*/
+    @Schema(description = "是否上架(0 未上架  1  上架)")
+    private String status;
+    @Schema(description = "第三方用户id")
+    private String threeUserId;
+//    /**总数*/
+//    @Schema(description = "权益包总数")
+//    @TableField(exist = false)
+//    private Integer totalNumber;
+
+    /**套餐id套餐名称*/
+    @Schema(description = "套餐id套餐名称")
+    @TableField(exist = false)
+    private String selectNameId;
+
+
+
+    /**第三方用户id*/
+    @Schema(description = "第三方用户id")
+    @TableField(exist = false)
+    private List<String> threeUserIdList;
+
+
+    @Schema(description  = "渠道用户id")
+    @TableField(exist = false)
+    private List<String> channelIds;
+
 }

commons/src/main/java/com/jzg/commons/entity/rights/dto/InsOrderRightsInfoDto.java

@@ -17,6 +17,7 @@ import java.util.List;
 public class InsOrderRightsInfoDto {
     @Schema(description = "订单关联权益套餐列表")
     private List<InsOrderRightsPackageDto> insOrderRightsPackageList;
+
     @Schema(description = "订单关联权益券列表")
     private List<InsOrderRightsDto> insOrderRightsList;
 

commons/src/main/java/com/jzg/commons/entity/system/po/SysSystemBusPerms.java

@@ -57,6 +57,8 @@ public class SysSystemBusPerms implements Serializable {
     private Integer ownerRights;
     @Schema(description = "车主权益PC端可用还是APP端可用1.PC，2：APP")
     private Integer clientType;
+    @Schema(description = "账号互通")
+    private Integer accountLinking;
 
 
 
@@ -82,5 +84,6 @@ public class SysSystemBusPerms implements Serializable {
             this.ownerRights = sysSystemBusPermsVo.getOwnerRights();
         }
         this.clientType  = sysSystemBusPermsVo.getClientType();
+        this.accountLinking = sysSystemBusPermsVo.getAccountLinking();
     }
 }

commons/src/main/java/com/jzg/commons/entity/system/vo/SysSystemBusPermsVo.java

@@ -83,6 +83,9 @@ public class SysSystemBusPermsVo implements Serializable {
     @Schema(description = "PC端还是APP端可用1：PC，2：APP")
     private Integer clientType;
 
+    @Schema(description = "账号互通")
+    private Integer accountLinking;
+
     public SysSystemBusPermsVo(SysSystemBusPerms sysSystemBusPerms, List<SysSystemBusPermsLink> links) {
         this.id = sysSystemBusPerms.getId();
 //        this.companyId = sysSystemBusPerms.getCompanyId();
@@ -100,6 +103,9 @@ public class SysSystemBusPermsVo implements Serializable {
             this.ownerRights = sysSystemBusPerms.getOwnerRights();
         }
         this.clientType = sysSystemBusPerms.getClientType();
+
+        this.accountLinking = sysSystemBusPerms.getAccountLinking();
+
         //报价的保司
         this.quoteCompanyList.addAll(links.stream()
                 .filter(link -> link.getBusCode().equals(SystemBusPermsConstants.QUOTE_COMPANY_BUS.getCode()))
@@ -122,8 +128,9 @@ public class SysSystemBusPermsVo implements Serializable {
 
         //业务员提现申请付款审核指定机构
         this.salesmanWithdrawPaymentAuditDeptList.addAll(links.stream()
-             .filter(link -> link.getBusCode().equals(SystemBusPermsConstants.SALESMAN_WITHDRAW_PAYMENT_AUDIT_DEPT.getCode()))
-             .map(link->link.getBusId()).collect(Collectors.toList()));
+                .filter(link -> link.getBusCode().equals(SystemBusPermsConstants.SALESMAN_WITHDRAW_PAYMENT_AUDIT_DEPT.getCode()))
+                .map(link->link.getBusId()).collect(Collectors.toList()));
+
     }
 
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsOrderRightsInfoController.java

@@ -9,6 +9,8 @@ import jakarta.validation.constraints.NotBlank;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.lang.reflect.InvocationTargetException;
+
 /**
  * 类描述：订单选择权益入口controller
  * @author guozidong
@@ -23,7 +25,7 @@ public class InsOrderRightsInfoController {
     private InsOrderRightsInfoService insOrderRightsInfoService;
     @PostMapping("/saveRights")
     @Operation(summary = "保存权益券信息")
-    public HttpResult saveInsOrderRightsInfo(@RequestBody InsOrderRightsInfoDto insOrderRightsInfoDto,@RequestParam("orderNo") String orderNo) {
+    public HttpResult saveInsOrderRightsInfo(@RequestBody InsOrderRightsInfoDto insOrderRightsInfoDto,@RequestParam("orderNo") String orderNo) throws InvocationTargetException, IllegalAccessException {
         return insOrderRightsInfoService.saveInsOrderRightsInfo(insOrderRightsInfoDto,orderNo);
     }
     @GetMapping("/getRightsByOrderNo")

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -293,83 +293,83 @@ public class UnifyOrderManager {
             //////////////////////////////////////////新增营销抽奖活动////////////////////////////////////////////////
             //远程调用活动列表
             //匹配规则 每报价()次，可得()次抽奖机会，每日最多()次抽奖
-//            HttpResult<List<LotteryActivityVO>> result = localLivingClient.queryActivityRules(lotteryScene);
-//            if (result == null || result.getCode() != 200 || result.getData() == null) {
-//                log.error("统一报价，查询本地生活的活动列表异常");
-//            } else {
-//                for (LotteryActivityVO activity : result.getData()) {
-//                    // 检查活动是否有效
-//                    if (!LocalDate.now().isBefore(activity.getActivityStartTime())
-//                            && !LocalDate.now().isAfter(activity.getActivityEndTime())) {
-//                        continue;
-//                    }
-//
-//                    if (activity.getLocalActivityTables() == null) {
-//                        continue;
-//                    }
-//                    // 遍历所有本地活动表
-//                    for (LocalActivityTableVO table : activity.getLocalActivityTables()) {
-//                        // 只处理 type=6 的报价规则
-//                        if (!"6".equals(table.getType())) {
-//                            continue;
-//                        }
-//
-//                        // 只处理本租户的报价规则
-//                        if (!baseController.getUserSystemCode().equals(table.getTenantId())) {
-//                            continue;
-//                        }
-//                        // 查询是否在一账通绑定
-//                        UnifiedUserCenterDTO unifiedUserCenterDTO = new UnifiedUserCenterDTO();
-//                        unifiedUserCenterDTO.setUserId(quoteVo.getOrder().getRealQuoteUserId());
-//                        unifiedUserCenterDTO.setClientId(CLIENT_ID);
-//                        unifiedUserCenterDTO.setTenantId(baseController.getUserSystemCode());
-//                        HttpResult<UnifiedUserClientVO> unifiedUserClientVOHttpResult = null;
-//                        try {
-//                            unifiedUserClientVOHttpResult = localLivingClient.queryBind(unifiedUserCenterDTO);
-//                        } catch (Exception e) {
-//                            log.info("业务员报价，查询用户绑定一账通接口异常,userId:{},clientId:{},tenantId:{}", quoteVo.getOrder().getRealQuoteUserId(), CLIENT_ID, baseController.getUserSystemCode());
-//                            log.error("业务员报价，查询用户绑定一账通接口异常", e);
-//                        }
-//                        if (unifiedUserClientVOHttpResult == null || unifiedUserClientVOHttpResult.getCode() != 200 || unifiedUserClientVOHttpResult.getData() == null) {
-//                            // 判断是否满足条件
-//                            // 业务员报价次数是否大于等于本活动规定时间范围内的报价次数
-//                            // 统计业务员的报价次数
-//                            int count = insOrdersService.countQuoteNum(baseController.getUserSystemCode(), quoteVo.getOrder().getRealQuoteUserId(), activity.getActivityStartTime(), activity.getActivityEndTime());
-//                            if (count >= Integer.parseInt(table.getQutNum()) && count <= Integer.parseInt(table.getQutLotteryMax())) {
-//                                // 存本地记录 等绑定后更新本地记录的同步状态字段即可
-//                                completeRule(baseController.getUserSystemCode(), quoteVo.getOrder().getRealQuoteUserId(), null, activity.getId(),
-//                                        table.getId(), table.getQutNum() ,table.getQutLotteryNum() ,table.getQutLotteryMax() ,YesNoEnum.NO.getCode(), 6);
-//                                log.info("业务员报价，满足条件插入记录,userId:{},clientId:{},tenantId:{}", quoteVo.getOrder().getRealQuoteUserId(), CLIENT_ID, baseController.getUserSystemCode());
-//                            }
-//                        }else {
-//                            Map<String, List<UnifiedUserClientVO>> userClientGroupMap = unifiedUserClientVOHttpResult.getData().getUserClients()
-//                                    .stream()
-//                                    .collect(Collectors.groupingBy(UnifiedUserClientVO::getClientId));
-//                            // 首先查业务员是否在一账通绑定过本地生活  【已绑定过 远程调抽奖次数增加接口 标记已同步
-//                            if (userClientGroupMap.containsKey(CLIENT_ID)) {
-//                                LotteryCounDTO lotteryCounDTO = new LotteryCounDTO();
-//                                lotteryCounDTO.setAppUserId(quoteVo.getOrder().getRealQuoteUserId());
-//                                lotteryCounDTO.setActivityId(activity.getId());
-//                                lotteryCounDTO.setCount(Integer.parseInt(table.getQutLotteryNum()));
-//                                HttpResult<LotteryCountVO> lotteryCountVOHttpResult = null;
-//                                try {
-//                                    lotteryCountVOHttpResult = localLivingClient.addLotteryCount(lotteryCounDTO);
-//                                } catch (Exception e) {
-//                                    log.info("业务员报价，远程调用本地生活抽奖次数增加接口异常,userId:{},count:{},tenantId:{}", quoteVo.getOrder().getRealQuoteUserId(), table.getQutLotteryNum(), baseController.getUserSystemCode());
-//                                    log.error("业务员报价，远程调用本地生活抽奖次数增加异常", e);
-//                                }
-//                                if (lotteryCountVOHttpResult != null && lotteryCountVOHttpResult.getData().getSuccess()) {
-//                                    // 记录规则完成  标记已同步
-//                                    completeRule(baseController.getUserSystemCode(), quoteVo.getOrder().getRealQuoteUserId(), null, activity.getId(),
-//                                            table.getId(), table.getQutNum(), table.getQutLotteryNum(), table.getQutLotteryMax(), YesNoEnum.YES.getCode(), 6);
-//
-//                                    log.info("业务员报价，满足条件插入记录并远程同步,userId:{},clientId:{},tenantId:{}", quoteVo.getOrder().getRealQuoteUserId(), CLIENT_ID, baseController.getUserSystemCode());
-//                                }
-//                            }
-//                        }
-//                    }
-//                }
-//            }
+            HttpResult<List<LotteryActivityVO>> result = localLivingClient.queryActivityRules(lotteryScene);
+            if (result == null || result.getCode() != 200 || result.getData() == null) {
+                log.error("统一报价，查询本地生活的活动列表异常");
+            } else {
+                for (LotteryActivityVO activity : result.getData()) {
+                    // 检查活动是否有效
+                    if (!LocalDate.now().isBefore(activity.getActivityStartTime())
+                            && !LocalDate.now().isAfter(activity.getActivityEndTime())) {
+                        continue;
+                    }
+
+                    if (activity.getLocalActivityTables() == null) {
+                        continue;
+                    }
+                    // 遍历所有本地活动表
+                    for (LocalActivityTableVO table : activity.getLocalActivityTables()) {
+                        // 只处理 type=6 的报价规则
+                        if (!"6".equals(table.getType())) {
+                            continue;
+                        }
+
+                        // 只处理本租户的报价规则
+                        if (!baseController.getUserSystemCode().equals(table.getTenantId())) {
+                            continue;
+                        }
+                        // 查询是否在一账通绑定
+                        UnifiedUserCenterDTO unifiedUserCenterDTO = new UnifiedUserCenterDTO();
+                        unifiedUserCenterDTO.setUserId(quoteVo.getOrder().getRealQuoteUserId());
+                        unifiedUserCenterDTO.setClientId(CLIENT_ID);
+                        unifiedUserCenterDTO.setTenantId(baseController.getUserSystemCode());
+                        HttpResult<UnifiedUserClientVO> unifiedUserClientVOHttpResult = null;
+                        try {
+                            unifiedUserClientVOHttpResult = localLivingClient.queryBind(unifiedUserCenterDTO);
+                        } catch (Exception e) {
+                            log.info("业务员报价，查询用户绑定一账通接口异常,userId:{},clientId:{},tenantId:{}", quoteVo.getOrder().getRealQuoteUserId(), CLIENT_ID, baseController.getUserSystemCode());
+                            log.error("业务员报价，查询用户绑定一账通接口异常", e);
+                        }
+                        if (unifiedUserClientVOHttpResult == null || unifiedUserClientVOHttpResult.getCode() != 200 || unifiedUserClientVOHttpResult.getData() == null) {
+                            // 判断是否满足条件
+                            // 业务员报价次数是否大于等于本活动规定时间范围内的报价次数
+                            // 统计业务员的报价次数
+                            int count = insOrdersService.countQuoteNum(baseController.getUserSystemCode(), quoteVo.getOrder().getRealQuoteUserId(), activity.getActivityStartTime(), activity.getActivityEndTime());
+                            if (count >= Integer.parseInt(table.getQutNum()) && count <= Integer.parseInt(table.getQutLotteryMax())) {
+                                // 存本地记录 等绑定后更新本地记录的同步状态字段即可
+                                completeRule(baseController.getUserSystemCode(), quoteVo.getOrder().getRealQuoteUserId(), null, activity.getId(),
+                                        table.getId(), table.getQutNum() ,table.getQutLotteryNum() ,table.getQutLotteryMax() ,YesNoEnum.NO.getCode(), 6);
+                                log.info("业务员报价，满足条件插入记录,userId:{},clientId:{},tenantId:{}", quoteVo.getOrder().getRealQuoteUserId(), CLIENT_ID, baseController.getUserSystemCode());
+                            }
+                        }else {
+                            Map<String, List<UnifiedUserClientVO>> userClientGroupMap = unifiedUserClientVOHttpResult.getData().getUserClients()
+                                    .stream()
+                                    .collect(Collectors.groupingBy(UnifiedUserClientVO::getClientId));
+                            // 首先查业务员是否在一账通绑定过本地生活  【已绑定过 远程调抽奖次数增加接口 标记已同步
+                            if (userClientGroupMap.containsKey(CLIENT_ID)) {
+                                LotteryCounDTO lotteryCounDTO = new LotteryCounDTO();
+                                lotteryCounDTO.setAppUserId(quoteVo.getOrder().getRealQuoteUserId());
+                                lotteryCounDTO.setActivityId(activity.getId());
+                                lotteryCounDTO.setCount(Integer.parseInt(table.getQutLotteryNum()));
+                                HttpResult<LotteryCountVO> lotteryCountVOHttpResult = null;
+                                try {
+                                    lotteryCountVOHttpResult = localLivingClient.addLotteryCount(lotteryCounDTO);
+                                } catch (Exception e) {
+                                    log.info("业务员报价，远程调用本地生活抽奖次数增加接口异常,userId:{},count:{},tenantId:{}", quoteVo.getOrder().getRealQuoteUserId(), table.getQutLotteryNum(), baseController.getUserSystemCode());
+                                    log.error("业务员报价，远程调用本地生活抽奖次数增加异常", e);
+                                }
+                                if (lotteryCountVOHttpResult != null && lotteryCountVOHttpResult.getData().getSuccess()) {
+                                    // 记录规则完成  标记已同步
+                                    completeRule(baseController.getUserSystemCode(), quoteVo.getOrder().getRealQuoteUserId(), null, activity.getId(),
+                                            table.getId(), table.getQutNum(), table.getQutLotteryNum(), table.getQutLotteryMax(), YesNoEnum.YES.getCode(), 6);
+
+                                    log.info("业务员报价，满足条件插入记录并远程同步,userId:{},clientId:{},tenantId:{}", quoteVo.getOrder().getRealQuoteUserId(), CLIENT_ID, baseController.getUserSystemCode());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
 
 
         } catch (Exception e) {
@@ -403,7 +403,7 @@ public class UnifyOrderManager {
         }
 
         SysUserActivityCompleteInRule record = new SysUserActivityCompleteInRule();
-        record.setTenantId(tenantId);
+        record.setSystemCode(tenantId);
         record.setUserId(userId);
         record.setUserPhone(userPhone);
         record.setActivityType(activityType);

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrderRightsInfoService.java

@@ -4,6 +4,8 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.rights.dto.InsOrderRightsInfoDto;
 import com.jzg.commons.entity.rights.vo.InsOrderRightsInfoVo;
 
+import java.lang.reflect.InvocationTargetException;
+
 
 /**
  * 类描述：
@@ -18,7 +20,7 @@ public interface InsOrderRightsInfoService {
     * @param insOrderRightsInfoDto
     * @return
     */
-   HttpResult saveInsOrderRightsInfo(InsOrderRightsInfoDto insOrderRightsInfoDto,String orderNo);
+   HttpResult saveInsOrderRightsInfo(InsOrderRightsInfoDto insOrderRightsInfoDto,String orderNo) throws InvocationTargetException, IllegalAccessException;
 
    /**
     * 根据订单ID查询权益信息

tenant/organization/src/main/java/com/jzg/organization/client/LotteryActivityClient.java

@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * 抽奖活动客户端
  */
-@FeignClient(name = "lottery-activity", url = "https://life.baoxianzhanggui.com/jeecg-boot/")
+@FeignClient(name = "lottery-activity", url = "https://life.baoxianzhanggui.com/locallive-pro-java/")
 public interface LotteryActivityClient {
 
     /**

tenant/organization/src/main/java/com/jzg/organization/controller/SignInController.java

@@ -22,7 +22,7 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-@RequestMapping("/api/signIn")
+@RequestMapping("/signIn")
 @Tag(name = "签到管理", description = "用户签到相关接口")
 public class SignInController extends BaseController {
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -351,13 +351,14 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         String userSystemCode = baseController.getUserSystemCode();
         log.info("租户匹配保司以及保司下的协议等信息。 schemeRuleFilterVo=[{}]，userSystemCode=[{}]",
                 JSONUtil.toJsonStr(schemeRuleFilterVo),userSystemCode);
+
         //如果用户租户code为App  则使用参数传来的租户code
-        String systemCode = "";
-        if ("APP".equals(baseController.getUserSystemCode())) {
-            systemCode = baseController.getAppSystemCode();
-        } else {
-            systemCode = baseController.getUserSystemCode();
-        }
+        String systemCode = baseController.getSystemCode();
+
+
+        log.info("getUserSystemCode:{}",baseController.getUserSystemCode());
+        log.info("获取到的租户Code:{}",systemCode);
+
         //根据权限获取所有保司
         HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode);
         log.info("租户[{}]有权限的保司有[{}]个", systemCode, CollUtil.size(companyListResult.getData()));