Browse Source

添加查询参数修复;修复核销状态

v1.0
Yen 2 years ago
parent
commit
bae204b51f
  1. 9
      src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java
  2. 6
      src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

9
src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java

@ -42,9 +42,15 @@ public class VtbVerification implements Serializable {
/** 申请id */ /** 申请id */
private Long costApplyId; private Long costApplyId;
@TableField(condition = SqlCondition.LIKE)
private String costApplyCode;
/** 活动id */ /** 活动id */
private Long activityId; private Long activityId;
@TableField(condition = SqlCondition.LIKE)
private String activityCode;
/** 政策项id */ /** 政策项id */
private Long policyItemId; private Long policyItemId;
@ -87,11 +93,13 @@ public class VtbVerification implements Serializable {
/** 客户编码 */ /** 客户编码 */
@NotBlank(message = "客户编码不能为空") @NotBlank(message = "客户编码不能为空")
@Length(max = 30,message = "客户编码长度不能超过30字") @Length(max = 30,message = "客户编码长度不能超过30字")
@TableField(condition = SqlCondition.LIKE)
private String supplierCode; private String supplierCode;
/** 客户名称 */ /** 客户名称 */
@NotBlank(message = "客户名称不能为空") @NotBlank(message = "客户名称不能为空")
@Length(max = 30,message = "客户名称长度不能超过30字") @Length(max = 30,message = "客户名称长度不能超过30字")
@TableField(condition = SqlCondition.LIKE)
private String supplierName; private String supplierName;
/** 支付方式id */ /** 支付方式id */
@ -143,6 +151,7 @@ public class VtbVerification implements Serializable {
private String userId; private String userId;
/** 用户编码 */ /** 用户编码 */
@TableField(condition = SqlCondition.LIKE)
@Length(max = 32,message = "长度不能超过32字") @Length(max = 32,message = "长度不能超过32字")
private String userCode; private String userCode;

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

@ -135,10 +135,12 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
if(condition!=null){ if(condition!=null){
verification.setPayConditionId(condition.getId()); verification.setPayConditionId(condition.getId());
} }
verification.setActivityCode(activity.getActivityCode());
verification.setCostApplyCode(costApply.getCode());
verification.setAmountRecord(param.getTotalCheckAmount()); verification.setAmountRecord(param.getTotalCheckAmount());
verification.setAmount(param.getTotalCheckAmount()); verification.setAmount(param.getTotalCheckAmount());
verification.setVerificationCode("HX"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification)); verification.setVerificationCode("HX"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification));
verification.setVerificationState(VtbVerificationState.Commiting.getCode()); verification.setVerificationState(VtbVerificationState.Finished.getCode());
verification.setCostApplyId(costApply.getId()); verification.setCostApplyId(costApply.getId());
verification.setActivityId(activity.getId()); verification.setActivityId(activity.getId());
verification.setSupplierId(activity.getSupplierId()); verification.setSupplierId(activity.getSupplierId());
@ -601,6 +603,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
validActivity(cotractFlag,activity,true,isCurrentCommit); validActivity(cotractFlag,activity,true,isCurrentCommit);
VtbVerification verification = new VtbVerification(); VtbVerification verification = new VtbVerification();
verification.setId(verificationBo.getId()); verification.setId(verificationBo.getId());
verification.setCostApplyCode(costApply.getCode());
verification.setActivityCode(activity.getActivityCode());
verification.setPayConditionId(verificationBo.getPayConditionId()); verification.setPayConditionId(verificationBo.getPayConditionId());
verification.setVerificationCode("HX"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification)); verification.setVerificationCode("HX"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification));
verification.setVerificationState(VtbVerificationState.Commiting.getCode()); verification.setVerificationState(VtbVerificationState.Commiting.getCode());

Loading…
Cancel
Save