Merge branch 'dev/dev_xp' into dev/dev

src/main/java/com/ai/da/mapper/primary/AccountMapper.java

@@ -32,8 +32,10 @@ public interface AccountMapper extends CommonMapper<Account> {
 
     void toVisitor(Long id);
 
-    List<AccountCreditsUsageDTO> selectCreditUsage(boolean groupByEvent, String changeEvent, String role, String userEmail, Long id, String startTime, String endTime, Integer size, Integer offset);
+    List<AccountCreditsUsageDTO> selectCreditUsage(boolean groupByEvent, String changeEvent, String role,
+                                                   String userEmail, Long id, String startTime, String endTime,
+                                                   Integer size, Integer offset, String organizationName);
 
-    int countCreditUsage(boolean groupByEvent, String changeEvent, String role, String userEmail, Long id, String startTime, String endTime);
+    int countCreditUsage(boolean groupByEvent, String changeEvent, String role, String userEmail, Long id, String startTime, String endTime, String organizationName);
 
 }

src/main/java/com/ai/da/model/vo/InitializeProgressVO.java

@@ -1,10 +1,16 @@
 package com.ai.da.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class InitializeProgressVO {
     private Boolean analyzed;
 
     private double percent;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private LocalDateTime computeTime;
 }

src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java

@@ -883,11 +883,11 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
             int offset = (queryDTO.getPage() - 1) * size;
             List<AccountCreditsUsageDTO> creditsUsageDTOS = accountMapper.selectCreditUsage(
                     groupByEvent, queryDTO.getChangeEvent(), role, queryDTO.getUserEmail(), queryDTO.getId(),
-                    queryDTO.getStartTime(), queryDTO.getEndTime(), size, offset);
+                    queryDTO.getStartTime(), queryDTO.getEndTime(), size, offset, account.getOrganizationName());
             if (!creditsUsageDTOS.isEmpty()){
                 int total = accountMapper.countCreditUsage(
                         groupByEvent, queryDTO.getChangeEvent(), role, queryDTO.getUserEmail(), queryDTO.getId(),
-                        queryDTO.getStartTime(), queryDTO.getEndTime());
+                        queryDTO.getStartTime(), queryDTO.getEndTime(), account.getOrganizationName());
                 // 总页数
                 double totalPage = Math.ceil((double) total / size);
                 // 组装返回参数

src/main/java/com/ai/da/service/impl/ReferralServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ai.da.service.impl;
 
+import com.ai.da.common.config.exception.BusinessException;
 import com.ai.da.mapper.primary.ReferralMapper;
 import com.ai.da.mapper.primary.entity.Affiliate;
 import com.ai.da.mapper.primary.entity.Referral;
@@ -64,6 +65,10 @@ public class ReferralServiceImpl extends ServiceImpl<ReferralMapper, Referral> i
     @Transactional(rollbackFor = Exception.class)
     public void editReferral(EditReferralDTO editReferralDTO){
         Referral referral = baseMapper.selectById(editReferralDTO.getId());
+        if (Objects.isNull(referral)){
+            throw new BusinessException("unknown referral id");
+        }
+
         if (Objects.nonNull(editReferralDTO.getAmount()) && editReferralDTO.getAmount().compareTo(referral.getCommission()) != 0){
             log.info("设置referral id为{} 原佣金 {} 设置为 {}", referral.getId(), referral.getAffiliateId(), editReferralDTO.getAmount());
             referral.setCommission(editReferralDTO.getAmount());

src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java

@@ -1610,6 +1610,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
             return vo;
         }
         vo.setPercent(dto.getCurrent() * 1.0 / dto.getTotal());
+        vo.setComputeTime(dto.getComputeTime());
         return vo;
     }
 

src/main/resources/mapper/primary/AccountMapper.xml

@@ -84,6 +84,9 @@
                 a.system_user IN (0, 1, 2, 3, 4)
             </when>
         </choose>
+        <if test="organizationName != null and organizationName != ''">
+            AND a.organization_name = #{organizationName}
+        </if>
         <if test="id != null">
             AND a.id = #{id}
         </if>
@@ -126,6 +129,9 @@
                 a.system_user IN (0, 1, 2, 3, 4)
             </when>
         </choose>
+        <if test="organizationName != null and organizationName != ''">
+            AND a.organization_name = #{organizationName}
+        </if>
         <if test="userEmail != null and userEmail != ''">
             AND a.user_email = #{userEmail}
         </if>