Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622' into dev_jzg_lipf_v20260622

commons/src/main/java/com/jzg/commons/entity/account/po/SysUserAccountChangeLog.java

@@ -92,6 +92,7 @@ public class SysUserAccountChangeLog extends BaseModel {
         operTypeMap.put(2,"保单提成");
         operTypeMap.put(3,"提现");
         operTypeMap.put(4,"提现驳回");
+        operTypeMap.put(5,"提现中");
     }
 
     public String getOperTypeName(){

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

@@ -31,7 +31,6 @@ import com.jzg.commons.entity.quote.vo.orders.InsFeeCalculateRequest;
 import com.jzg.commons.entity.quote.vo.orders.InsFeeCalculateResponse;
 import com.jzg.quotation.summary.entity.vo.*;
 
-import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserAccountIncomeLogMapper.java

@@ -21,21 +21,75 @@ public interface SysUserAccountIncomeLogMapper extends BaseMapper<SysUserAccount
      * @date 2026/6/8 17:25
      */
     @Select("""
-        select
-            ioci.license_no ,
-            io.signing_time  as signTime,
-            saa.auditing_time as payTime,
-            a.*
-        from
-            sys_user_account_change_log a
-        left join ins_orders_car_info ioci on
-            a.related_order_id = ioci.order_no
-        left join ins_orders io
-            on a.related_order_id = io.id
-        left join sys_amount_auditing saa
-            on saa.id = a.related_amount_auditing_id
+        
+            select * from(
+        	SELECT
+        		a.system_code ,
+        		ioci.license_no,
+        		io.signing_time AS signTime,
+        		saa.auditing_time AS payTime,
+        		a.user_id,
+        		a.jzg_info_id,
+        		a.user_name,
+        		a.amount,
+        		a.amount_before,
+        		a.amount_after,
+        		a.oper_type,
+        		a.related_order_id,
+        		a.bank_card_id_to,
+        		a.bank_card_no_to,
+        		a.bank_card_id_in,
+        		a.bank_card_no_in,
+        		a.is_delete,
+        		a.create_time,
+        		a.remark,
+        		a.related_amount_auditing_id,
+        		a.status
+        	FROM
+        		sys_user_account_change_log a
+        	LEFT JOIN ins_orders_car_info ioci ON
+        		a.related_order_id = ioci.order_no
+        	LEFT JOIN ins_orders io ON
+        		a.related_order_id = io.id
+        	LEFT JOIN sys_amount_auditing saa
+        	ON
+        		saa.id = a.related_amount_auditing_id
+        		AND saa.system_code = 'G111'
+        union ALL
+        	select
+        		saa.system_code ,
+        		null as license_no,
+        		null as signTime,
+        		null as payTime,
+        		saa.user_id,
+        		null as zg_info_id,
+        		su.username as user_name,
+        		saa.amount,
+        		(saa.amount + saa.balance_amount) as amount_before,
+        		saa.balance_amount as amount_after,
+        		5 as oper_type,
+        		null as related_order_id,
+        		null as bank_card_id_to,
+        		null as bank_card_no_to,
+        		null as bank_card_id_in,
+        		null as bank_card_no_in,
+        		null as is_delete,
+        		saa.create_time,
+        		'提现中' as remark,
+        		null as related_amount_auditing_id,
+        		10 as status
+        	from
+        		sys_amount_auditing saa
+        	    left join sys_user su on saa.user_id = su.id
+        	where
+        		saa.auditing_status = 0
+        ) mm
         where
-            a.user_id = #{ywyUserId} and a.create_time >= #{beginDate} and a.create_time < #{endDate}  order by a.create_time desc
+        	mm.user_id =  #{ywyUserId}
+        	and mm.create_time >= #{beginDate} and mm.create_time < #{endDate} 
+        	AND mm.system_code = #{systemCode}
+        order by
+        	mm.create_time desc
         """)
-    List<SysUserAccountChangeLog> queryYwyIORecs(String ywyUserId, LocalDate beginDate, LocalDate endDate);
+    List<SysUserAccountChangeLog> queryYwyIORecs(String systemCode, String ywyUserId, LocalDate beginDate, LocalDate endDate);
 }

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

@@ -359,6 +359,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
      */
     private void saveChangeLog(SysAmountAuditing audit, AmountAuditRejectParam param, String systemCode) {
         log.info("提现申请不通过的时候，向changeLog表中插入一条状态为90的数据。audit=[{}],param=[{}]", JSONUtil.toJsonStr(audit), JSONUtil.toJsonStr(param));
+        String userName = baseController.getUserName();
         SysUserAccountChangeLog log = new SysUserAccountChangeLog();
         log.setRelatedAmountAuditingId(audit.getId());
         log.setStatus("90");
@@ -367,6 +368,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
         log.setRemark("提现驳回");
         log.setSystemCode(audit.getSystemCode());
         log.setUserId(audit.getUserId());
+        log.setUserName(userName);
         log.setOperType(4);
         log.setIsDelete(1);
         SysAmountAuditing sysAmountAuditing = baseMapper.selectById(param.getId());

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.account.po.SysUserAccountChangeLog;
 import com.jzg.commons.entity.dto.YwyIOParam;
@@ -11,6 +12,7 @@ import com.jzg.organization.mapper.*;
 import com.jzg.organization.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
@@ -25,6 +27,10 @@ public class SysUserAccountIncomeLogServiceImpl extends ServiceImpl<SysUserAccou
 
     private static final Logger log = LoggerFactory.getLogger(SysUserAccountIncomeLogServiceImpl.class);
 
+    @Autowired
+    private BaseController baseController;
+
+
     /**
      * 查询业务员收支明细
      *
@@ -39,7 +45,8 @@ public class SysUserAccountIncomeLogServiceImpl extends ServiceImpl<SysUserAccou
         if(endDate != null){
             ywyIOParam.setEndDate(endDate.plusDays(1));
         }
-        List<SysUserAccountChangeLog> changeLogs =  baseMapper.queryYwyIORecs(ywyIOParam.getYwyUserId(), ywyIOParam.getBeginDate(), ywyIOParam.getEndDate());
+        String systemCode = baseController.getSystemCode();
+        List<SysUserAccountChangeLog> changeLogs =  baseMapper.queryYwyIORecs(systemCode, ywyIOParam.getYwyUserId(), ywyIOParam.getBeginDate(), ywyIOParam.getEndDate());
         log.info("查询业务员收支明细：ywyIOParam=[{}]。 查询出[{}]条记录", JSONUtil.toJsonStr(ywyIOParam), CollUtil.size(changeLogs));
         return changeLogs;
     }