Browse Source

操作状态名单新增状态名单生成时间字段

shuiqilin
zhangxin 1 year ago
parent
commit
d23ba66e4a

+ 10
- 1
src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/VehicleStatusListChangeRequest.java View File

private String uniqueKey ; private String uniqueKey ;
private String openId; private String openId;
private String accessToken; private String accessToken;

/** 状态名单生成时间 */
private String createTime ;
/** 操作人 */ /** 操作人 */
private String operator ; private String operator ;


public void setOperator(String operator) { public void setOperator(String operator) {
this.operator = operator; this.operator = operator;
} }

public String getCreateTime() {
return createTime;
}

public void setCreateTime(String createTime) {
this.createTime = createTime;
}
} }

+ 6
- 1
src/main/java/com/qtzl/alterSales/manager/service/AflSupplementaryPayOrderServiceImpl.java View File

userStateHandler(fssPaccountPay, request.getPayId()); userStateHandler(fssPaccountPay, request.getPayId());
// //
//进行统计累加已收款金额 //进行统计累加已收款金额
aflPaccountRefundCountService.saveFind(request.getPayId());
try {
aflPaccountRefundCountService.saveFind(request.getPayId());
} catch (Exception e) {
log.error("进行统计累加已收款金额失败... payId:{}", request.getPayId());
e.printStackTrace();
}


supplementaryPayOrderRepo.save(supplementaryPayOrder); supplementaryPayOrderRepo.save(supplementaryPayOrder);
accountPayRepo.save(fssPaccountPay); accountPayRepo.save(fssPaccountPay);

+ 17
- 8
src/main/java/com/qtzl/alterSales/manager/service/AflVehicleStatusInfoServiceImpl.java View File

import com.qtzl.alterSales.dao.repo.jpa.primary.AflBindInfoRepo; import com.qtzl.alterSales.dao.repo.jpa.primary.AflBindInfoRepo;
import com.qtzl.alterSales.dao.repo.jpa.primary.FssPaccountPayRepo; import com.qtzl.alterSales.dao.repo.jpa.primary.FssPaccountPayRepo;
import com.qtzl.alterSales.dao.repo.jpa.second.AflCenterVehicleInfoRepo; import com.qtzl.alterSales.dao.repo.jpa.second.AflCenterVehicleInfoRepo;
import com.qtzl.alterSales.dao.repo.jpa.second.AflTokenRepo;
import com.qtzl.alterSales.dao.repo.jpa.second.AflVehicleStatusHisInfoRepo; import com.qtzl.alterSales.dao.repo.jpa.second.AflVehicleStatusHisInfoRepo;
import com.qtzl.alterSales.dao.repo.jpa.second.AflVehicleStatusInfoRepo; import com.qtzl.alterSales.dao.repo.jpa.second.AflVehicleStatusInfoRepo;
import com.qtzl.alterSales.manager.enums.BlacklistOpType; import com.qtzl.alterSales.manager.enums.BlacklistOpType;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;


import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.Duration;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.List; import java.util.List;
@Resource @Resource
private FssBlackListManager fssBlackListManager; private FssBlackListManager fssBlackListManager;
@Resource @Resource
private AflTokenRepo aflTokenRepo;
@Resource
SendCenterService sendCenterService; SendCenterService sendCenterService;


@Override @Override
isParamCheck(request); isParamCheck(request);
AflVehicleStatusInfo aflVehicleStatusInfo = aflVehicleStatusInfoRepo.findByVehicleIdAndCardIdAndObuId(request.getVehicleId(),request.getCpuId(),request.getObuId()); AflVehicleStatusInfo aflVehicleStatusInfo = aflVehicleStatusInfoRepo.findByVehicleIdAndCardIdAndObuId(request.getVehicleId(),request.getCpuId(),request.getObuId());
Boolean flash = true; Boolean flash = true;
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
log.info("操作状态名单-查询状态名单记录为{}",JSON.toJSON(aflVehicleStatusInfo)); log.info("操作状态名单-查询状态名单记录为{}",JSON.toJSON(aflVehicleStatusInfo));
if (aflVehicleStatusInfo!=null){ if (aflVehicleStatusInfo!=null){
flash=false; flash=false;
if (request.getType().equals(aflVehicleStatusInfo.getType())){ if (request.getType().equals(aflVehicleStatusInfo.getType())){
throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("当为状态已为"+ BlacklistOpType.findByCode(request.getType()).getValue()); throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("当为状态已为"+ BlacklistOpType.findByCode(request.getType()).getValue());
} }
Duration dur= Duration.between(aflVehicleStatusInfo.getUpdateTime(), LocalDateTime.now() );
long minute = dur.toMinutes();
// Duration dur= Duration.between(aflVehicleStatusInfo.getUpdateTime(), LocalDateTime.now() );
// long minute = dur.toMinutes();
// //5分钟内不允许操作 // //5分钟内不允许操作
// long minMinute=5L; // long minMinute=5L;
// if (minute<minMinute){ // if (minute<minMinute){
aflVehicleStatusInfo=new AflVehicleStatusInfo(); aflVehicleStatusInfo=new AflVehicleStatusInfo();
} }
BeanUtils.copyProperties(request,aflVehicleStatusInfo); BeanUtils.copyProperties(request,aflVehicleStatusInfo);
aflVehicleStatusInfo.setCreateTime(LocalDateTime.now());
if (StringUtils.isEmpty(request.getCreateTime()) ){
aflVehicleStatusInfo.setCreateTime(LocalDateTime.now());
}else {
LocalDateTime createTime = null;
try {
createTime = LocalDateTime.parse(request.getCreateTime(), formatter);
} catch (Exception e) {
log.error("操作状态名单-转换时间异常,时间为{}",request.getCreateTime());
throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("状态名单生成时间格式有误,格式应为yyyy-MM-ddTHH:mm:ss");
}
aflVehicleStatusInfo.setCreateTime(createTime);
}

if (flash){ if (flash){
AflBindInfo aflBindInfo = aflBindInfoRepo.findByVehicleId(request.getVehicleId()); AflBindInfo aflBindInfo = aflBindInfoRepo.findByVehicleId(request.getVehicleId());
log.info("操作状态名单-查询车辆绑定记录为{}",JSON.toJSON(aflBindInfo)); log.info("操作状态名单-查询车辆绑定记录为{}",JSON.toJSON(aflBindInfo));
log.info("操作状态名单-查询状态名单记录为{}",JSON.toJSON(aflVehicleStatusInfo)); log.info("操作状态名单-查询状态名单记录为{}",JSON.toJSON(aflVehicleStatusInfo));
VehicleBlackListRequest vehicleBlackListRequest = new VehicleBlackListRequest(); VehicleBlackListRequest vehicleBlackListRequest = new VehicleBlackListRequest();
BeanUtils.copyProperties(request,vehicleBlackListRequest); BeanUtils.copyProperties(request,vehicleBlackListRequest);
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
vehicleBlackListRequest.setCreateTime(aflVehicleStatusInfo.getCreateTime().format(formatter)); vehicleBlackListRequest.setCreateTime(aflVehicleStatusInfo.getCreateTime().format(formatter));
boolean implement; boolean implement;
try { try {

+ 6
- 1
src/main/java/com/qtzl/alterSales/manager/service/ChoiceBillsOperationServiceImpl.java View File

pay.setWxOrderId(payOrder.getOrderNo()); pay.setWxOrderId(payOrder.getOrderNo());
// //
//进行统计累加已收款金额 //进行统计累加已收款金额
aflPaccountRefundCountService.saveFind(pay.getPayId());
try {
aflPaccountRefundCountService.saveFind(pay.getPayId());
} catch (Exception e) {
e.printStackTrace();
log.error("进行统计累加已收款金额失败... payId:{}", pay.getPayId());
}
supplementaryPayOrderService.paySuccessNotify(pay.getPayId(), payTime, payOrder.getOrderNo()); supplementaryPayOrderService.paySuccessNotify(pay.getPayId(), payTime, payOrder.getOrderNo());
}); });
accountPayRepo.saveAll(accountPayList); accountPayRepo.saveAll(accountPayList);

Loading…
Cancel
Save