营销抽奖活动-签到、报价、出单、承保

commons/src/main/java/com/jzg/commons/entity/po/SysUserActivityCompleteInRule.java

@@ -24,7 +24,7 @@ public class SysUserActivityCompleteInRule extends BaseModel {
     private String id;
 
     @Schema(description = "租户ID")
-    private String tenantId;
+    private String systemCode;
 
     @Schema(description = "用户ID")
     private String userId;

commons/src/main/java/com/jzg/commons/entity/po/SysUserSignIn.java

@@ -25,7 +25,7 @@ public class SysUserSignIn extends BaseModel {
     private String id;
 
     @Schema(description = "租户ID")
-    private String tenantId;
+    private String systemCode;
 
     @Schema(description = "用户ID")
     private String userId;

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

@@ -73,7 +73,7 @@ public class SignInServiceImpl implements SignInService {
     public HttpResult updateSignCompleteRuleIn(SysUserActivityCompleteInRule dto){
         log.info("修改签到规则同步状态：dto=[{}]", JSONUtil.toJsonStr(dto));
         UpdateWrapper<SysUserActivityCompleteInRule> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq(StrUtil.isNotBlank(dto.getTenantId()), "tenant_id", dto.getTenantId());
+        updateWrapper.eq(StrUtil.isNotBlank(dto.getSystemCode()), "system_code", dto.getSystemCode());
         updateWrapper.eq(StrUtil.isNotBlank(dto.getUserId()), "user_id", dto.getUserId());
         updateWrapper.eq(StrUtil.isNotBlank(dto.getActivityId()), "activity_id", dto.getActivityId());
         updateWrapper.eq(StrUtil.isNotBlank(dto.getLocalActivityTableId()), "local_activity_table_id", dto.getLocalActivityTableId());
@@ -107,7 +107,7 @@ public class SignInServiceImpl implements SignInService {
 
         // 保存签到记录
         SysUserSignIn signIn = new SysUserSignIn();
-        signIn.setTenantId(tenantId);
+        signIn.setSystemCode(tenantId);
         signIn.setUserId(userId);
         signIn.setSignInDate(today);
         signIn.setContinuousDays(continuousDays);
@@ -270,7 +270,7 @@ public class SignInServiceImpl implements SignInService {
         }
 
         SysUserActivityCompleteInRule record = new SysUserActivityCompleteInRule();
-        record.setTenantId(tenantId);
+        record.setSystemCode(tenantId);
         record.setUserId(userId);
         record.setActivityType(activityType);
         record.setActivityId(activityId);
@@ -373,7 +373,7 @@ public class SignInServiceImpl implements SignInService {
         // 查询累计签到天数
         Integer totalDays = signInMapper.selectCount(
                 Wrappers.<SysUserSignIn>lambdaQuery()
-                        .eq(SysUserSignIn::getTenantId, tId)
+                        .eq(SysUserSignIn::getSystemCode, tId)
                         .eq(SysUserSignIn::getUserId, uId)
                         .eq(SysUserSignIn::getIsDelete, 0)
         ).intValue();

tenant/organization/src/main/resources/mapper/SysUserActivityCompleteInRuleMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="selectCompletedRules" resultType="com.jzg.commons.entity.po.SysUserActivityCompleteInRule">
         SELECT * FROM sys_user_sign_in_rule
-        WHERE tenant_id = #{tenantId}
+        WHERE system_code = #{tenantId}
           AND user_id = #{userId}
           AND activity_id = #{activityId}
           AND activity_type = #{activityType}
@@ -14,7 +14,7 @@
 
     <select id="selectByRule" resultType="com.jzg.commons.entity.po.SysUserActivityCompleteInRule">
         SELECT * FROM sys_user_sign_in_rule
-        WHERE tenant_id = #{tenantId}
+        WHERE system_code = #{tenantId}
           AND user_id = #{userId}
           AND activity_id = #{activityId}
           AND activity_type = #{activityType}

tenant/organization/src/main/resources/mapper/SysUserSignInMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="selectLatestByUser" resultType="com.jzg.commons.entity.po.SysUserSignIn">
         SELECT * FROM sys_user_sign_in
-        WHERE tenant_id = #{tenantId}
+        WHERE system_code = #{tenantId}
           AND user_id = #{userId}
           AND is_delete = 0
         ORDER BY sign_in_date DESC
@@ -13,7 +13,7 @@
 
     <select id="countByDate" resultType="java.lang.Integer">
         SELECT COUNT(*) FROM sys_user_sign_in
-        WHERE tenant_id = #{tenantId}
+        WHERE system_code = #{tenantId}
           AND user_id = #{userId}
           AND sign_in_date = #{signInDate}
           AND is_delete = 0
@@ -21,7 +21,7 @@
 
     <select id="selectListByUser" resultType="com.jzg.commons.entity.po.SysUserSignIn">
         SELECT * FROM sys_user_sign_in
-        WHERE tenant_id = #{tenantId}
+        WHERE system_code = #{tenantId}
           AND user_id = #{userId}
           AND sign_in_date BETWEEN #{startDate} AND #{endDate}
           AND is_delete = 0
@@ -30,7 +30,7 @@
 
     <select id="selectMaxContinuousDays" resultType="java.lang.Integer">
         SELECT MAX(continuous_days) FROM sys_user_sign_in
-        WHERE tenant_id = #{tenantId}
+        WHERE system_code = #{tenantId}
           AND user_id = #{userId}
           AND is_delete = 0
     </select>