2.0-master
袁野 7 months ago
parent 7bfdcb2e74
commit c4831d2eaf
  1. 31
      hai-cweb/src/main/java/com/cweb/controller/Etc/EtcCustomerController.java
  2. 23
      hai-service/src/main/java/com/hai/dao/EtcContractOrderMapper.java
  3. 56
      hai-service/src/main/java/com/hai/dao/EtcContractOrderSqlProvider.java
  4. 66
      hai-service/src/main/java/com/hai/entity/EtcContractOrder.java
  5. 250
      hai-service/src/main/java/com/hai/entity/EtcContractOrderExample.java
  6. 3
      hai-service/src/main/java/com/hai/etc/impl/EtcCarMsgServiceImpl.java

@ -123,6 +123,36 @@ public class EtcCustomerController {
) {
try {
EtcContractOrder contractOrder = etcCarMsgService.findContractOrderById(id);
if (contractOrder == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未查询到合同!");
}
// 查询车辆信息
Map<String , Object> mapCar = new HashMap<>();
mapCar.put("vehId" , contractOrder.getVehId());
mapCar.put("custId" , contractOrder.getCustId());
EtcCarMsg carMsg = etcCarMsgService.findEtcCarByMap(mapCar);
if (carMsg == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未查询到信息!");
}
// 查询车辆状态
JSONObject car = EtcService.getVehStatus(carMsg);
if (car.getString("errCode").equals("0")) {
carMsg.setVehStatus(car.getJSONObject("result").getInteger("vehStatus"));
carMsg.setPayStatus(car.getJSONObject("result").getInteger("payStatus"));
carMsg.setSignStatus(car.getJSONObject("result").getInteger("signStatus"));
contractOrder.setVehStatus(carMsg.getVehStatus());
etcCarMsgService.updateEtcCar(carMsg);
}
// 查询微信签约代扣信息
return ResponseMsgUtil.success(etcCarMsgService.findContractOrderById(id));
} catch (Exception e) {
@ -188,7 +218,6 @@ public class EtcCustomerController {
carMsg.setSignStatus(1);
carMsg.setUpdateTime(new Date());
carMsg.setVehStatus(15);
etcCarMsgService.updateEtcCar(carMsg);

@ -45,7 +45,9 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt {
"card_variety_name, sign_img, ",
"create_time, update_time, ",
"`status`, pay_status, ",
"sign_status, op_id, ",
"sign_status, bank_sign, ",
"wechat_sign, need_sign_wechat, ",
"veh_status, op_id, ",
"op_name, ext_1, ext_2, ",
"ext_3)",
"values (#{phone,jdbcType=VARCHAR}, #{contractNo,jdbcType=VARCHAR}, ",
@ -54,7 +56,9 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt {
"#{cardVarietyName,jdbcType=VARCHAR}, #{signImg,jdbcType=VARCHAR}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{status,jdbcType=INTEGER}, #{payStatus,jdbcType=INTEGER}, ",
"#{signStatus,jdbcType=INTEGER}, #{opId,jdbcType=BIGINT}, ",
"#{signStatus,jdbcType=INTEGER}, #{bankSign,jdbcType=INTEGER}, ",
"#{wechatSign,jdbcType=INTEGER}, #{needSignWechat,jdbcType=VARCHAR}, ",
"#{vehStatus,jdbcType=INTEGER}, #{opId,jdbcType=BIGINT}, ",
"#{opName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
"#{ext3,jdbcType=VARCHAR})"
})
@ -82,6 +86,10 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt {
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER),
@Result(column="sign_status", property="signStatus", jdbcType=JdbcType.INTEGER),
@Result(column="bank_sign", property="bankSign", jdbcType=JdbcType.INTEGER),
@Result(column="wechat_sign", property="wechatSign", jdbcType=JdbcType.INTEGER),
@Result(column="need_sign_wechat", property="needSignWechat", jdbcType=JdbcType.VARCHAR),
@Result(column="veh_status", property="vehStatus", jdbcType=JdbcType.INTEGER),
@Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
@Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@ -94,7 +102,8 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt {
"select",
"id, phone, contract_no, cust_id, veh_id, product_id, card_variety_id, product_name, ",
"card_variety_name, sign_img, create_time, update_time, `status`, pay_status, ",
"sign_status, op_id, op_name, ext_1, ext_2, ext_3",
"sign_status, bank_sign, wechat_sign, need_sign_wechat, veh_status, op_id, op_name, ",
"ext_1, ext_2, ext_3",
"from etc_contract_order",
"where id = #{id,jdbcType=BIGINT}"
})
@ -114,6 +123,10 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt {
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER),
@Result(column="sign_status", property="signStatus", jdbcType=JdbcType.INTEGER),
@Result(column="bank_sign", property="bankSign", jdbcType=JdbcType.INTEGER),
@Result(column="wechat_sign", property="wechatSign", jdbcType=JdbcType.INTEGER),
@Result(column="need_sign_wechat", property="needSignWechat", jdbcType=JdbcType.VARCHAR),
@Result(column="veh_status", property="vehStatus", jdbcType=JdbcType.INTEGER),
@Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
@Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@ -147,6 +160,10 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt {
"`status` = #{status,jdbcType=INTEGER},",
"pay_status = #{payStatus,jdbcType=INTEGER},",
"sign_status = #{signStatus,jdbcType=INTEGER},",
"bank_sign = #{bankSign,jdbcType=INTEGER},",
"wechat_sign = #{wechatSign,jdbcType=INTEGER},",
"need_sign_wechat = #{needSignWechat,jdbcType=VARCHAR},",
"veh_status = #{vehStatus,jdbcType=INTEGER},",
"op_id = #{opId,jdbcType=BIGINT},",
"op_name = #{opName,jdbcType=VARCHAR},",
"ext_1 = #{ext1,jdbcType=VARCHAR},",

@ -84,6 +84,22 @@ public class EtcContractOrderSqlProvider {
sql.VALUES("sign_status", "#{signStatus,jdbcType=INTEGER}");
}
if (record.getBankSign() != null) {
sql.VALUES("bank_sign", "#{bankSign,jdbcType=INTEGER}");
}
if (record.getWechatSign() != null) {
sql.VALUES("wechat_sign", "#{wechatSign,jdbcType=INTEGER}");
}
if (record.getNeedSignWechat() != null) {
sql.VALUES("need_sign_wechat", "#{needSignWechat,jdbcType=VARCHAR}");
}
if (record.getVehStatus() != null) {
sql.VALUES("veh_status", "#{vehStatus,jdbcType=INTEGER}");
}
if (record.getOpId() != null) {
sql.VALUES("op_id", "#{opId,jdbcType=BIGINT}");
}
@ -128,6 +144,10 @@ public class EtcContractOrderSqlProvider {
sql.SELECT("`status`");
sql.SELECT("pay_status");
sql.SELECT("sign_status");
sql.SELECT("bank_sign");
sql.SELECT("wechat_sign");
sql.SELECT("need_sign_wechat");
sql.SELECT("veh_status");
sql.SELECT("op_id");
sql.SELECT("op_name");
sql.SELECT("ext_1");
@ -210,6 +230,22 @@ public class EtcContractOrderSqlProvider {
sql.SET("sign_status = #{record.signStatus,jdbcType=INTEGER}");
}
if (record.getBankSign() != null) {
sql.SET("bank_sign = #{record.bankSign,jdbcType=INTEGER}");
}
if (record.getWechatSign() != null) {
sql.SET("wechat_sign = #{record.wechatSign,jdbcType=INTEGER}");
}
if (record.getNeedSignWechat() != null) {
sql.SET("need_sign_wechat = #{record.needSignWechat,jdbcType=VARCHAR}");
}
if (record.getVehStatus() != null) {
sql.SET("veh_status = #{record.vehStatus,jdbcType=INTEGER}");
}
if (record.getOpId() != null) {
sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
}
@ -253,6 +289,10 @@ public class EtcContractOrderSqlProvider {
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}");
sql.SET("sign_status = #{record.signStatus,jdbcType=INTEGER}");
sql.SET("bank_sign = #{record.bankSign,jdbcType=INTEGER}");
sql.SET("wechat_sign = #{record.wechatSign,jdbcType=INTEGER}");
sql.SET("need_sign_wechat = #{record.needSignWechat,jdbcType=VARCHAR}");
sql.SET("veh_status = #{record.vehStatus,jdbcType=INTEGER}");
sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}");
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
@ -324,6 +364,22 @@ public class EtcContractOrderSqlProvider {
sql.SET("sign_status = #{signStatus,jdbcType=INTEGER}");
}
if (record.getBankSign() != null) {
sql.SET("bank_sign = #{bankSign,jdbcType=INTEGER}");
}
if (record.getWechatSign() != null) {
sql.SET("wechat_sign = #{wechatSign,jdbcType=INTEGER}");
}
if (record.getNeedSignWechat() != null) {
sql.SET("need_sign_wechat = #{needSignWechat,jdbcType=VARCHAR}");
}
if (record.getVehStatus() != null) {
sql.SET("veh_status = #{vehStatus,jdbcType=INTEGER}");
}
if (record.getOpId() != null) {
sql.SET("op_id = #{opId,jdbcType=BIGINT}");
}

@ -84,10 +84,30 @@ public class EtcContractOrder implements Serializable {
private Integer payStatus;
/**
* 签约状态1已签约 0未签约
* 合同签约状态1已签约 0未签约
*/
private Integer signStatus;
/**
* 银行签约代扣状态 1已签约 0未签约
*/
private Integer bankSign;
/**
* 微信签约代扣状态 1已签约 0未签约
*/
private Integer wechatSign;
/**
* 是否需要签约微信代扣 1 需要 0不需要
*/
private String needSignWechat;
/**
* 11:待审核,12:待推送,13:已推送高速审核,15:待激活,20:已激活(已启用),21:已停用,22:已挂起,23:已挂失,28:注销审核中,29:注销中,30:已注销,31:审核拒绝,32:已取消,33:高速已拒绝
*/
private Integer vehStatus;
/**
* 操作人
*/
@ -235,6 +255,38 @@ public class EtcContractOrder implements Serializable {
this.signStatus = signStatus;
}
public Integer getBankSign() {
return bankSign;
}
public void setBankSign(Integer bankSign) {
this.bankSign = bankSign;
}
public Integer getWechatSign() {
return wechatSign;
}
public void setWechatSign(Integer wechatSign) {
this.wechatSign = wechatSign;
}
public String getNeedSignWechat() {
return needSignWechat;
}
public void setNeedSignWechat(String needSignWechat) {
this.needSignWechat = needSignWechat;
}
public Integer getVehStatus() {
return vehStatus;
}
public void setVehStatus(Integer vehStatus) {
this.vehStatus = vehStatus;
}
public Long getOpId() {
return opId;
}
@ -302,6 +354,10 @@ public class EtcContractOrder implements Serializable {
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getPayStatus() == null ? other.getPayStatus() == null : this.getPayStatus().equals(other.getPayStatus()))
&& (this.getSignStatus() == null ? other.getSignStatus() == null : this.getSignStatus().equals(other.getSignStatus()))
&& (this.getBankSign() == null ? other.getBankSign() == null : this.getBankSign().equals(other.getBankSign()))
&& (this.getWechatSign() == null ? other.getWechatSign() == null : this.getWechatSign().equals(other.getWechatSign()))
&& (this.getNeedSignWechat() == null ? other.getNeedSignWechat() == null : this.getNeedSignWechat().equals(other.getNeedSignWechat()))
&& (this.getVehStatus() == null ? other.getVehStatus() == null : this.getVehStatus().equals(other.getVehStatus()))
&& (this.getOpId() == null ? other.getOpId() == null : this.getOpId().equals(other.getOpId()))
&& (this.getOpName() == null ? other.getOpName() == null : this.getOpName().equals(other.getOpName()))
&& (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
@ -328,6 +384,10 @@ public class EtcContractOrder implements Serializable {
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getPayStatus() == null) ? 0 : getPayStatus().hashCode());
result = prime * result + ((getSignStatus() == null) ? 0 : getSignStatus().hashCode());
result = prime * result + ((getBankSign() == null) ? 0 : getBankSign().hashCode());
result = prime * result + ((getWechatSign() == null) ? 0 : getWechatSign().hashCode());
result = prime * result + ((getNeedSignWechat() == null) ? 0 : getNeedSignWechat().hashCode());
result = prime * result + ((getVehStatus() == null) ? 0 : getVehStatus().hashCode());
result = prime * result + ((getOpId() == null) ? 0 : getOpId().hashCode());
result = prime * result + ((getOpName() == null) ? 0 : getOpName().hashCode());
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
@ -357,6 +417,10 @@ public class EtcContractOrder implements Serializable {
sb.append(", status=").append(status);
sb.append(", payStatus=").append(payStatus);
sb.append(", signStatus=").append(signStatus);
sb.append(", bankSign=").append(bankSign);
sb.append(", wechatSign=").append(wechatSign);
sb.append(", needSignWechat=").append(needSignWechat);
sb.append(", vehStatus=").append(vehStatus);
sb.append(", opId=").append(opId);
sb.append(", opName=").append(opName);
sb.append(", ext1=").append(ext1);

@ -1095,6 +1095,256 @@ public class EtcContractOrderExample {
return (Criteria) this;
}
public Criteria andBankSignIsNull() {
addCriterion("bank_sign is null");
return (Criteria) this;
}
public Criteria andBankSignIsNotNull() {
addCriterion("bank_sign is not null");
return (Criteria) this;
}
public Criteria andBankSignEqualTo(Integer value) {
addCriterion("bank_sign =", value, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignNotEqualTo(Integer value) {
addCriterion("bank_sign <>", value, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignGreaterThan(Integer value) {
addCriterion("bank_sign >", value, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignGreaterThanOrEqualTo(Integer value) {
addCriterion("bank_sign >=", value, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignLessThan(Integer value) {
addCriterion("bank_sign <", value, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignLessThanOrEqualTo(Integer value) {
addCriterion("bank_sign <=", value, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignIn(List<Integer> values) {
addCriterion("bank_sign in", values, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignNotIn(List<Integer> values) {
addCriterion("bank_sign not in", values, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignBetween(Integer value1, Integer value2) {
addCriterion("bank_sign between", value1, value2, "bankSign");
return (Criteria) this;
}
public Criteria andBankSignNotBetween(Integer value1, Integer value2) {
addCriterion("bank_sign not between", value1, value2, "bankSign");
return (Criteria) this;
}
public Criteria andWechatSignIsNull() {
addCriterion("wechat_sign is null");
return (Criteria) this;
}
public Criteria andWechatSignIsNotNull() {
addCriterion("wechat_sign is not null");
return (Criteria) this;
}
public Criteria andWechatSignEqualTo(Integer value) {
addCriterion("wechat_sign =", value, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignNotEqualTo(Integer value) {
addCriterion("wechat_sign <>", value, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignGreaterThan(Integer value) {
addCriterion("wechat_sign >", value, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignGreaterThanOrEqualTo(Integer value) {
addCriterion("wechat_sign >=", value, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignLessThan(Integer value) {
addCriterion("wechat_sign <", value, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignLessThanOrEqualTo(Integer value) {
addCriterion("wechat_sign <=", value, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignIn(List<Integer> values) {
addCriterion("wechat_sign in", values, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignNotIn(List<Integer> values) {
addCriterion("wechat_sign not in", values, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignBetween(Integer value1, Integer value2) {
addCriterion("wechat_sign between", value1, value2, "wechatSign");
return (Criteria) this;
}
public Criteria andWechatSignNotBetween(Integer value1, Integer value2) {
addCriterion("wechat_sign not between", value1, value2, "wechatSign");
return (Criteria) this;
}
public Criteria andNeedSignWechatIsNull() {
addCriterion("need_sign_wechat is null");
return (Criteria) this;
}
public Criteria andNeedSignWechatIsNotNull() {
addCriterion("need_sign_wechat is not null");
return (Criteria) this;
}
public Criteria andNeedSignWechatEqualTo(String value) {
addCriterion("need_sign_wechat =", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatNotEqualTo(String value) {
addCriterion("need_sign_wechat <>", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatGreaterThan(String value) {
addCriterion("need_sign_wechat >", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatGreaterThanOrEqualTo(String value) {
addCriterion("need_sign_wechat >=", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatLessThan(String value) {
addCriterion("need_sign_wechat <", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatLessThanOrEqualTo(String value) {
addCriterion("need_sign_wechat <=", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatLike(String value) {
addCriterion("need_sign_wechat like", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatNotLike(String value) {
addCriterion("need_sign_wechat not like", value, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatIn(List<String> values) {
addCriterion("need_sign_wechat in", values, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatNotIn(List<String> values) {
addCriterion("need_sign_wechat not in", values, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatBetween(String value1, String value2) {
addCriterion("need_sign_wechat between", value1, value2, "needSignWechat");
return (Criteria) this;
}
public Criteria andNeedSignWechatNotBetween(String value1, String value2) {
addCriterion("need_sign_wechat not between", value1, value2, "needSignWechat");
return (Criteria) this;
}
public Criteria andVehStatusIsNull() {
addCriterion("veh_status is null");
return (Criteria) this;
}
public Criteria andVehStatusIsNotNull() {
addCriterion("veh_status is not null");
return (Criteria) this;
}
public Criteria andVehStatusEqualTo(Integer value) {
addCriterion("veh_status =", value, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusNotEqualTo(Integer value) {
addCriterion("veh_status <>", value, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusGreaterThan(Integer value) {
addCriterion("veh_status >", value, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("veh_status >=", value, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusLessThan(Integer value) {
addCriterion("veh_status <", value, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusLessThanOrEqualTo(Integer value) {
addCriterion("veh_status <=", value, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusIn(List<Integer> values) {
addCriterion("veh_status in", values, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusNotIn(List<Integer> values) {
addCriterion("veh_status not in", values, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusBetween(Integer value1, Integer value2) {
addCriterion("veh_status between", value1, value2, "vehStatus");
return (Criteria) this;
}
public Criteria andVehStatusNotBetween(Integer value1, Integer value2) {
addCriterion("veh_status not between", value1, value2, "vehStatus");
return (Criteria) this;
}
public Criteria andOpIdIsNull() {
addCriterion("op_id is null");
return (Criteria) this;

@ -38,7 +38,7 @@ public class EtcCarMsgServiceImpl implements EtcCarMsgService {
JSONObject car = EtcService.getVehStatus(etcCarMsg);
if (car.getString("errCode").equals("0")) {
etcCarMsg.setVehStatus(13);
etcCarMsg.setVehStatus(car.getJSONObject("result").getInteger("vehStatus"));
etcCarMsg.setPayStatus(car.getJSONObject("result").getInteger("payStatus"));
etcCarMsg.setSignStatus(car.getJSONObject("result").getInteger("signStatus"));
@ -53,6 +53,7 @@ public class EtcCarMsgServiceImpl implements EtcCarMsgService {
contractOrder.setCardVarietyName(EtcVarietyEnum.getNameByType(etcCarMsg.getCardVarietyId()));
contractOrder.setVehId(etcCarMsg.getVehId());
contractOrder.setPayStatus(1);
contractOrder.setVehStatus(etcCarMsg.getVehStatus());
contractOrder.setSignStatus(0);
contractOrder.setOpId(etcCarMsg.getUserId());
contractOrder.setOpName(etcCarMsg.getUserName());

Loading…
Cancel
Save