Browse Source

核销到销路通替换为请求支付API

v1.0
Yen 2 years ago
parent
commit
18557dcf76
  1. 4
      pom.xml
  2. 85
      src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java
  3. 122
      src/main/java/com/qs/serve/modules/third/util/ThirtyVerificationUtil.java
  4. 6
      src/main/java/com/qs/serve/modules/vtb/entity/so/VtbActivityCheckSo.java
  5. 140
      src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
  6. 16
      src/main/resources/mapper/vtb/VtbVerReportMapper.xml

4
pom.xml

@ -153,11 +153,11 @@
<version>8.0.15</version>
</dependency>
<dependency>
<!--<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>8.4.1.jre8</version>
</dependency>
</dependency>-->
<dependency>
<groupId>org.springframework</groupId>

85
src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

@ -25,8 +25,10 @@ import com.qs.serve.modules.pay.service.PayPaymentService;
import com.qs.serve.modules.seeyon.entity.XltApticlaim;
import com.qs.serve.modules.seeyon.entity.XltPaymentRecord;
import com.qs.serve.modules.seeyon.service.XiaoLuTonService;
import com.qs.serve.modules.sys.entity.SysSyncLog;
import com.qs.serve.modules.sys.entity.SysUser;
import com.qs.serve.modules.sys.mapper.SysUserCodeMathMapper;
import com.qs.serve.modules.sys.service.SysSyncLogService;
import com.qs.serve.modules.sys.service.SysUserService;
import com.qs.serve.modules.tbs.common.TbsActivityState;
import com.qs.serve.modules.tbs.common.TbsCostApplyState;
@ -35,6 +37,7 @@ import com.qs.serve.modules.tbs.entity.*;
import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult;
import com.qs.serve.modules.tbs.service.*;
import com.qs.serve.modules.third.entity.*;
import com.qs.serve.modules.third.util.ThirtyVerificationUtil;
import com.qs.serve.modules.tzc.common.TzPolicyItemStatus;
import com.qs.serve.modules.tzc.entity.TzcPolicyGoodsSync;
import com.qs.serve.modules.tzc.entity.TzcPolicyItem;
@ -49,6 +52,7 @@ import com.qs.serve.modules.vtb.service.VtbVerificationService;
import com.qs.serve.modules.vtb.service.VtbVerificationSubjectService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.Nullable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -70,6 +74,7 @@ import java.util.stream.Collectors;
public class PortalOfCostApplication {
private SysUserCodeMathMapper userCodeMathMapper;
private final SysSyncLogService sysSyncLogService;
private TbsActivityService activityService;
private TbsActivityCenterService activityCenterService;
@ -436,31 +441,37 @@ public class PortalOfCostApplication {
verificationService.save(verification);
if(createBo.getToSaveCostCheckFlag()!=null&&createBo.getToSaveCostCheckFlag().equals(1)){
//发送请求到中间服务
XltApticlaim apticlaim = new XltApticlaim();
apticlaim.setVerificationCode(verification.getVerificationCode());
apticlaim.setCostCode(costApply.getCode());
apticlaim.setCostCode2(activity.getActivityCode());
apticlaim.setCusCode(verification.getSupplierCode());
apticlaim.setAmount(totalAmount);
apticlaim.setSubjectCode(subject.getSubjectCode());
apticlaim.setSubjectName(subject.getSubjectName());
apticlaim.setExpType("TI");
apticlaim.setApplyType("01");
apticlaim.setEffDate(nowDate_);
apticlaim.setInvoiced("2");
apticlaim.setCreateTime(nowDate_);
apticlaim.setStatus("00");
apticlaim.setDealTime(nowDate_);
apticlaim.setTopic(costApply.getChargeTheme());
try {
//todo 如果失败做补偿处理
xiaoLuTonService.saveApticlaim(apticlaim);
log.info("发送对象(apticlaim)到OA服务成功");
} catch (Exception e) {
e.printStackTrace();
log.error("发送对象到OA服务失败,数据内容如下:{}", JsonUtil.objectToJson(apticlaim));
}
//保存支付信息
String COST_TO_PAY_API = projectApisProperties.getCostToPay();
String json = ThirtyVerificationUtil.buildJson(supplier, subject, verification.getAmount()
, activity.getActTitle(),activity.getActStartDate().atStartOfDay(),activity.getActEndDate().atTime(23,59,59), verification);
SysSyncLog syncLog = ThirtyVerificationUtil.requestToPayment("to支付请求",verification.getVerificationCode(), COST_TO_PAY_API, json);
sysSyncLogService.save(syncLog);
// //发送请求到中间服务
// XltApticlaim apticlaim = new XltApticlaim();
// apticlaim.setVerificationCode(verification.getVerificationCode());
// apticlaim.setCostCode(costApply.getCode());
// apticlaim.setCostCode2(activity.getActivityCode());
// apticlaim.setCusCode(verification.getSupplierCode());
// apticlaim.setAmount(totalAmount);
// apticlaim.setSubjectCode(subject.getSubjectCode());
// apticlaim.setSubjectName(subject.getSubjectName());
// apticlaim.setExpType("TI");
// apticlaim.setApplyType("01");
// apticlaim.setEffDate(nowDate_);
// apticlaim.setInvoiced("2");
// apticlaim.setCreateTime(nowDate_);
// apticlaim.setStatus("00");
// apticlaim.setDealTime(nowDate_);
// apticlaim.setTopic(costApply.getChargeTheme());
// try {
// //todo 如果失败做补偿处理
// xiaoLuTonService.saveApticlaim(apticlaim);
// log.info("发送对象(apticlaim)到OA服务成功");
// } catch (Exception e) {
// e.printStackTrace();
// log.error("发送对象到OA服务失败,数据内容如下:{}", JsonUtil.objectToJson(apticlaim));
// }
}
//保存核销费用结果
@ -810,28 +821,8 @@ public class PortalOfCostApplication {
verificationSubjectService.save(verificationSubject);
//保存支付信息
String timeString = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
ThirtyVerification tv = new ThirtyVerification();
tv.setId(IdUtil.getSnowFlakeId()+"");
tv.setVerificationCode(verification.getVerificationCode());
tv.setActivityTitle(activityTitle);
//tv.setActivityCode(activityCode);
tv.setCreateDate(timeString);
tv.setStartDate(timeString);
tv.setEndDate(timeString);
tv.setSubjectCode(subject.getSubjectCode());
tv.setSubjectName(subject.getSubjectName());
tv.setMoney(totalAmount);
//tv.setCreateUser();
tv.setCreateTime(timeString);
//tv.setCheckUser(user.getName());
tv.setCheckTime(timeString);
tv.setCusCode(supplier.getCode());
tv.setCusName(supplier.getName());
tv.setRecId(verification.getVerificationCode());
String json = ThirtyVerificationUtil.buildJson(supplier, subject, totalAmount, activityTitle, verification);
String COST_TO_PAY_API = projectApisProperties.getCostToPay();
String json = JsonUtil.objectToJson(tv);
log.info("COST_TO_PAY_API 支付单信息:{} 数据:{}",verification.getVerificationCode(),json);
String rs = HttpUtil.doPost(COST_TO_PAY_API,json,null);
if(rs==null||!rs.contains("200")){
@ -891,6 +882,8 @@ public class PortalOfCostApplication {
}
/**
* 创建流程中初始化SKU列表
* @param invCodes

122
src/main/java/com/qs/serve/modules/third/util/ThirtyVerificationUtil.java

@ -0,0 +1,122 @@
package com.qs.serve.modules.third.util;
import com.qs.serve.common.util.HttpUtil;
import com.qs.serve.common.util.IdUtil;
import com.qs.serve.common.util.JsonUtil;
import com.qs.serve.modules.bms.entity.BmsSubject;
import com.qs.serve.modules.bms.entity.BmsSupplier;
import com.qs.serve.modules.sys.entity.SysSyncLog;
import com.qs.serve.modules.third.entity.ThirtyVerification;
import com.qs.serve.modules.vtb.entity.VtbVerification;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
/**
* @author YenHex
* @since 2023/9/14
*/
@Slf4j
public class ThirtyVerificationUtil {
/**
* 用于全过程生成
* @param supplier
* @param subject
* @param totalAmount
* @param activityTitle
* @param verification
* @return
*/
@Nullable
public static String buildJson(BmsSupplier supplier, BmsSubject subject, BigDecimal totalAmount, String activityTitle, VtbVerification verification) {
LocalDateTime nowTime = LocalDateTime.now();
String timeString = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
ThirtyVerification tv = new ThirtyVerification();
tv.setId(IdUtil.getSnowFlakeId()+"");
tv.setVerificationCode(verification.getVerificationCode());
tv.setActivityTitle(activityTitle);
//tv.setActivityCode(activityCode);
tv.setCreateDate(timeString);
tv.setStartDate(timeString);
tv.setEndDate(timeString);
tv.setSubjectCode(subject.getSubjectCode());
tv.setSubjectName(subject.getSubjectName());
tv.setMoney(totalAmount);
//tv.setCreateUser();
tv.setCreateTime(timeString);
//tv.setCheckUser(user.getName());
tv.setCheckTime(timeString);
tv.setCusCode(supplier.getCode());
tv.setCusName(supplier.getName());
tv.setRecId(verification.getVerificationCode());
String json = JsonUtil.objectToJson(tv);
return json;
}
/**
* 用于全过程生成
* @param supplier
* @param subject
* @param totalAmount
* @param activityTitle
* @param verification
* @return
*/
@Nullable
public static String buildJson(BmsSupplier supplier, BmsSubject subject, BigDecimal totalAmount, String activityTitle,
LocalDateTime startTime,LocalDateTime endTime, VtbVerification verification) {
LocalDateTime nowTime = LocalDateTime.now();
String timeString = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
String startTimeString = startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
String endTimeString = endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
ThirtyVerification tv = new ThirtyVerification();
tv.setId(IdUtil.getSnowFlakeId()+"");
tv.setVerificationCode(verification.getVerificationCode());
tv.setActivityTitle(activityTitle);
//tv.setActivityCode(activityCode);
tv.setCreateDate(timeString);
tv.setStartDate(startTimeString);
tv.setEndDate(endTimeString);
tv.setSubjectCode(subject.getSubjectCode());
tv.setSubjectName(subject.getSubjectName());
tv.setMoney(totalAmount);
//tv.setCreateUser();
tv.setCreateTime(timeString);
//tv.setCheckUser(user.getName());
tv.setCheckTime(timeString);
tv.setCusCode(supplier.getCode());
tv.setCusName(supplier.getName());
tv.setRecId(verification.getVerificationCode());
return JsonUtil.objectToJson(tv);
}
@NotNull
public static SysSyncLog requestToPayment(String title,String keyCode, String api, String json) {
log.info("COST_TO_PAY_API 支付单信息:{} 数据:{}", keyCode, json);
String rs = null;
try {
rs = HttpUtil.doPost(api, json,null);
} catch (Exception e) {
rs = e.getMessage();
}
SysSyncLog syncLog = new SysSyncLog();
syncLog.setFrom(title);
syncLog.setUrl(api);
syncLog.setRequestJson(json);
if(rs==null||!rs.contains("200")){
log.error("COST_TO_PAY_API \n 请求参数:{},\n 支付单信息:{},\n 结果:{}", json, keyCode,rs);
syncLog.setEntityClass("ThirtyVerification");
syncLog.setFailReason(rs);
syncLog.setRemark("支付失败:["+ keyCode+"]");
}else {
syncLog.setSuccessStatus(1);
syncLog.setRemark("支付完成:["+ keyCode+"]");
}
return syncLog;
}
}

6
src/main/java/com/qs/serve/modules/vtb/entity/so/VtbActivityCheckSo.java

@ -39,17 +39,17 @@ public class VtbActivityCheckSo {
/** 提交结束时间 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private String queryEndSubmitTime;
private LocalDateTime queryEndSubmitTime;
/** 核销开始时间 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private String queryStartCheckTime;
private LocalDateTime queryStartCheckTime;
/** 核销开始时间 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private String queryEndCheckTime;
private LocalDateTime queryEndCheckTime;
private Integer pageSize;

140
src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@ -3,6 +3,7 @@ package com.qs.serve.modules.vtb.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.qs.serve.common.config.properties.ProjectApisProperties;
import com.qs.serve.common.config.properties.ProjectProperties;
import com.qs.serve.common.framework.manager.AsyncFactory;
import com.qs.serve.common.framework.manager.AsyncManager;
@ -24,7 +25,9 @@ import com.qs.serve.modules.seeyon.entity.BaseCreateCallbackBo;
import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo;
import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
import com.qs.serve.modules.seeyon.service.XiaoLuTonService;
import com.qs.serve.modules.sys.entity.SysSyncLog;
import com.qs.serve.modules.sys.entity.SysUser;
import com.qs.serve.modules.sys.service.SysSyncLogService;
import com.qs.serve.modules.sys.service.SysUserService;
import com.qs.serve.modules.tbs.common.TbsActivityState;
import com.qs.serve.modules.tbs.common.TbsCostApplyState;
@ -35,6 +38,7 @@ import com.qs.serve.modules.tbs.entity.bo.TbsActivityReopenBo;
import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem;
import com.qs.serve.modules.tbs.mapper.TbsCostPercentMapper;
import com.qs.serve.modules.tbs.service.*;
import com.qs.serve.modules.third.util.ThirtyVerificationUtil;
import com.qs.serve.modules.vtb.common.VtbFundFlowType;
import com.qs.serve.modules.vtb.common.VtbVerificationState;
import com.qs.serve.modules.vtb.entity.*;
@ -47,6 +51,7 @@ import com.qs.serve.modules.vtb.service.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -84,6 +89,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
private final BmsChannelPointService channelPointService;
private final BmsSupplierService bmsSupplierService;
private final BirCenterRateService centerRateService;
private final SysSyncLogService sysSyncLogService;
private final ProjectApisProperties projectApisProperties;
private final VtbVerificationChannelService verificationChannelService;
private final VtbVerificationChannelPointService verificationChannelPointService;
@ -272,30 +280,42 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
verificationSubject.setRemark(param.getRemark());
verificationSubjectService.save(verificationSubject);
//发送请求到中间服务
XltApticlaim apticlaim = new XltApticlaim();
apticlaim.setVerificationCode(verification.getVerificationCode());
apticlaim.setCostCode(vtbSubCode);
apticlaim.setCostCode2(vtbSubCode);
apticlaim.setCusCode(verification.getSupplierCode());
apticlaim.setAmount(currentSubjectAmt);
apticlaim.setSubjectCode(activitySubject.getSubjectCode());
apticlaim.setSubjectName(activitySubject.getSubjectName());
apticlaim.setExpType("TI");
apticlaim.setApplyType("01");
apticlaim.setEffDate(nowDate_);
apticlaim.setInvoiced("2");
apticlaim.setCreateTime(nowDate_);
apticlaim.setStatus("00");
apticlaim.setDealTime(nowDate_);
apticlaim.setTopic(costApply.getChargeTheme());
try {
xiaoLuTonService.saveApticlaim(apticlaim);
log.info("发送对象(apticlaim)到OA服务成功");
} catch (Exception e) {
e.printStackTrace();
log.error("发送对象到OA服务失败,数据内容如下:{}", JsonUtil.objectToJson(apticlaim));
}
//保存支付信息
BmsSubject subject = new BmsSubject();
subject.setSubjectCode(activitySubject.getSubjectCode());
subject.setSubjectName(activitySubject.getSubjectName());
BmsSupplier supplier = new BmsSupplier();
supplier.setCode(activity.getSupplierCode());
supplier.setName(activity.getSupplierName());
String COST_TO_PAY_API = projectApisProperties.getCostToPay();
String json = ThirtyVerificationUtil.buildJson(supplier, subject, verification.getAmount()
, activity.getActTitle(),activity.getActStartDate().atStartOfDay(),activity.getActEndDate().atTime(23,59,59), verification);
SysSyncLog syncLog = ThirtyVerificationUtil.requestToPayment("to支付请求",verification.getVerificationCode(), COST_TO_PAY_API, json);
sysSyncLogService.save(syncLog);
// //发送请求到中间服务
// XltApticlaim apticlaim = new XltApticlaim();
// apticlaim.setVerificationCode(verification.getVerificationCode());
// apticlaim.setCostCode(vtbSubCode);
// apticlaim.setCostCode2(vtbSubCode);
// apticlaim.setCusCode(verification.getSupplierCode());
// apticlaim.setAmount(currentSubjectAmt);
// apticlaim.setSubjectCode(activitySubject.getSubjectCode());
// apticlaim.setSubjectName(activitySubject.getSubjectName());
// apticlaim.setExpType("TI");
// apticlaim.setApplyType("01");
// apticlaim.setEffDate(nowDate_);
// apticlaim.setInvoiced("2");
// apticlaim.setCreateTime(nowDate_);
// apticlaim.setStatus("00");
// apticlaim.setDealTime(nowDate_);
// apticlaim.setTopic(costApply.getChargeTheme());
// try {
// xiaoLuTonService.saveApticlaim(apticlaim);
// log.info("发送对象(apticlaim)到OA服务成功");
// } catch (Exception e) {
// e.printStackTrace();
// log.error("发送对象到OA服务失败,数据内容如下:{}", JsonUtil.objectToJson(apticlaim));
// }
}
if(CollectionUtil.isNotEmpty(activitySubject4Update)){
activitySubjectService.updateBatchById(activitySubject4Update);
@ -318,6 +338,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public void removeCheck(Long id) {
@ -971,37 +992,50 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
}
buildFundFlows(verificationId, addFundFlowList, activityGoodsListOfSubjectCenter,currentCenterAmount);
}
//发送请求到中间服务
XltApticlaim apticlaim = new XltApticlaim();
apticlaim.setVerificationCode(verificationSubject.getVerificationSubCode());
apticlaim.setCostCode(verificationSubject.getVerificationSubCode());
apticlaim.setCostCode2(verificationSubject.getVerificationSubCode());
apticlaim.setCusCode(verificationSubject.getSupplierCode());
apticlaim.setAmount(verificationSubject.getUsedAmount());
apticlaim.setSubjectCode(verificationSubject.getSubjectCode());
apticlaim.setSubjectName(verificationSubject.getSubjectName());
apticlaim.setExpType("TI");
apticlaim.setApplyType("01");
apticlaim.setEffDate(now2);
apticlaim.setInvoiced("2");
apticlaim.setCreateTime(now2);
apticlaim.setDealTime(now2);
apticlaim.setTopic(costApply.getChargeTheme());
//设置默认字段
apticlaim.setStatus("00");
apticlaim.setApticlaimAmtTax(BigDecimal.ZERO);
apticlaim.setApticlaimVat("0");
apticlaim.setApticlaimInvoice("");
BmsSubject subject = new BmsSubject();
subject.setSubjectCode(verificationSubject.getSubjectCode());
subject.setSubjectName(verificationSubject.getSubjectName());
BmsSupplier supplier = new BmsSupplier();
supplier.setCode(activity.getSupplierCode());
supplier.setName(activity.getSupplierName());
String COST_TO_PAY_API = projectApisProperties.getCostToPay();
String json = ThirtyVerificationUtil.buildJson(supplier, subject, verification.getAmount()
, activity.getActTitle(),activity.getActStartDate().atStartOfDay(),activity.getActEndDate().atTime(23,59,59), verification);
SysSyncLog syncLog = ThirtyVerificationUtil.requestToPayment("to支付请求",verification.getVerificationCode(), COST_TO_PAY_API, json);
sysSyncLogService.save(syncLog);
try {
//todo 如果失败做补偿处理
xiaoLuTonService.saveApticlaim(apticlaim);
log.info("发送对象(apticlaim)到OA服务成功");
} catch (Exception e) {
e.printStackTrace();
log.error("发送对象到OA服务失败,数据内容如下:{}",JsonUtil.objectToJson(apticlaim));
}
// //发送请求到中间服务
// XltApticlaim apticlaim = new XltApticlaim();
// apticlaim.setVerificationCode(verificationSubject.getVerificationSubCode());
// apticlaim.setCostCode(verificationSubject.getVerificationSubCode());
// apticlaim.setCostCode2(verificationSubject.getVerificationSubCode());
// apticlaim.setCusCode(verificationSubject.getSupplierCode());
// apticlaim.setAmount(verificationSubject.getUsedAmount());
// apticlaim.setSubjectCode(verificationSubject.getSubjectCode());
// apticlaim.setSubjectName(verificationSubject.getSubjectName());
// apticlaim.setExpType("TI");
// apticlaim.setApplyType("01");
// apticlaim.setEffDate(now2);
// apticlaim.setInvoiced("2");
// apticlaim.setCreateTime(now2);
// apticlaim.setDealTime(now2);
// apticlaim.setTopic(costApply.getChargeTheme());
//
// //设置默认字段
// apticlaim.setStatus("00");
// apticlaim.setApticlaimAmtTax(BigDecimal.ZERO);
// apticlaim.setApticlaimVat("0");
// apticlaim.setApticlaimInvoice("");
//
// try {
// //todo 如果失败做补偿处理
// xiaoLuTonService.saveApticlaim(apticlaim);
// log.info("发送对象(apticlaim)到OA服务成功");
// } catch (Exception e) {
// e.printStackTrace();
// log.error("发送对象到OA服务失败,数据内容如下:{}",JsonUtil.objectToJson(apticlaim));
// }
}
fundFlowService.saveBatch(addFundFlowList);
//更新已用费用记录,并更新活动状态是否完成

16
src/main/resources/mapper/vtb/VtbVerReportMapper.xml

@ -49,9 +49,9 @@
from vtb_verification vtb
where
vtb.del_flag = 0
<if test="query.queryStartCheckTime != null and query.queryStartCheckTime != ''">
<if test="query.queryStartCheckTime != null ">
and vtb.finished_time &gt;= #{query.queryStartCheckTime} </if>
<if test="query.queryEndSubmitTime != null and query.queryEndSubmitTime != ''">
<if test="query.queryEndSubmitTime != null ">
and vtb.finished_time &lt;= #{query.queryEndSubmitTime} </if>
group by vtb.activity_id
) vvtb on vvtb.activity_id = tbs_activity.id
@ -76,9 +76,9 @@
from vtb_verification vtb
where
vtb.del_flag = 0
<if test="query.queryStartCheckTime != null and query.queryStartCheckTime != ''">
<if test="query.queryStartCheckTime != null ">
and vtb.finished_time &gt;= #{query.queryStartCheckTime} </if>
<if test="query.queryEndSubmitTime != null and query.queryEndSubmitTime != ''">
<if test="query.queryEndSubmitTime != null ">
and vtb.finished_time &lt;= #{query.queryEndSubmitTime} </if>
group by vtb.activity_id
) vvtb on vvtb.activity_id = tbs_activity.id
@ -134,8 +134,8 @@
left join pay_payment pm
on pm.id = pay2.payment_id
where pm.cancel_flag= 0 and pay2.del_flag = 0 and pay2.pay_type = 'unPay'
<if test="query.startPayTime != null and query.startPayTime != ''"> and pm.create_time &lt;= #{query.startPayTime}</if>
<if test="query.endPayTime != null and query.endPayTime != ''"> and pm.create_time &lt;= #{query.endPayTime}</if>
<if test="query.startPayTime != null "> and pm.create_time &lt;= #{query.startPayTime}</if>
<if test="query.endPayTime != null "> and pm.create_time &lt;= #{query.endPayTime}</if>
group by pay2.verification_id
) pay_item2
on pay_item2.verification_id = vtb.id
@ -155,8 +155,8 @@
<if test="query.costApplyCode != null and query.costApplyCode != ''"> and `cost`.`code` like concat('%',#{query.costApplyCode},'%')</if>
<if test="query.verificationCode != null and query.verificationCode != ''"> and `cost`.`code` like concat('%',#{query.verificationCode},'%')</if>
<if test="query.chargeTheme != null and query.chargeTheme != ''"> and `cost`.`charge_theme` like concat('%',#{query.chargeTheme},'%')</if>
<if test="query.startCheckTime != null and query.startCheckTime != ''"> and `vtb`.`finished_time` &gt;= #{query.startCheckTime}</if>
<if test="query.startCheckTime != null and query.startCheckTime != ''"> and `vtb`.`finished_time` &lt;= #{query.endCheckTime}</if>
<if test="query.startCheckTime != null "> and `vtb`.`finished_time` &gt;= #{query.startCheckTime}</if>
<if test="query.startCheckTime != null "> and `vtb`.`finished_time` &lt;= #{query.endCheckTime}</if>
<if test="query.openPage!=null and query.openPage==1">
limit #{query.startRow},#{query.pageSize}
</if>

Loading…
Cancel
Save