From eff0612ccbb8065c35f531ea26655b1b20644f28 Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Tue, 23 Apr 2024 16:15:24 +0800 Subject: [PATCH] 1 --- .../controller/Etc/EtcCustomerController.java | 38 +--- .../controller/Etc/EtcCustomerController.java | 64 ++++++- .../com/hai/dao/EtcContractOrderMapper.java | 30 ++-- .../hai/dao/EtcContractOrderSqlProvider.java | 36 +++- .../java/com/hai/entity/EtcContractOrder.java | 38 +++- .../hai/entity/EtcContractOrderExample.java | 170 +++++++++++++++--- .../hai/etc/impl/EtcCarMsgServiceImpl.java | 4 + .../impl/OrderCreateHandleServiceImpl.java | 1 + .../impl/OrderPaySuccessServiceImpl.java | 5 +- .../resources/dev/commonConfig.properties | 6 +- 10 files changed, 305 insertions(+), 87 deletions(-) diff --git a/hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java b/hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java index f5c6675d..c4d6e49e 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java @@ -171,7 +171,7 @@ public class EtcCustomerController { etcCustMsg.setCreateTime(custMsg.getCreateTime()); etcCustMsgService.updateEtcCust(etcCustMsg); - return ResponseMsgUtil.success("成功"); + return ResponseMsgUtil.success(etcCustMsg); } catch (Exception e) { log.error("BsMsgController --> insertMsg() error!", e); @@ -374,44 +374,10 @@ public class EtcCustomerController { } } - @RequestMapping(value = "/getVehStatusByList", method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value = "getVehStatusByList") - public ResponseData getVehStatusByList() { - try { - - Map map = new HashMap<>(); - map.put("status" , "11,12,13,15"); - - - List list = etcCarMsgService.getEtcCarList(map); - - List data = new ArrayList<>(); - - for (EtcCarMsg carMsg : list) { - JSONObject object = EtcService.getVehStatus(carMsg); - - if (Objects.equals(object.getString("errCode"), "0") && object.getJSONObject("result") != null) { - carMsg.setVehStatus(object.getJSONObject("result").getInteger("vehStatus")); - carMsg.setUpdateTime(object.getJSONObject("result").getDate("activeTime")); - } - etcCarMsgService.updateEtcCar(carMsg); - object.put("carMsg" , carMsg); - data.add(object); - } - - return ResponseMsgUtil.success(data); - - } catch (Exception e) { - log.error("HighUserController --> findByUserId() error!", e); - return ResponseMsgUtil.exception(e); - } - } - @RequestMapping(value = "/queryActivateVehicleInfoPage", method = RequestMethod.GET) @ResponseBody - @ApiOperation(value = "queryActivateVehicleInfoPage") + @ApiOperation(value = "获取渠道商已激活车辆") public ResponseData queryActivateVehicleInfoPage() { try { diff --git a/hai-cweb/src/main/java/com/cweb/controller/Etc/EtcCustomerController.java b/hai-cweb/src/main/java/com/cweb/controller/Etc/EtcCustomerController.java index d5c39beb..5f62d346 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/Etc/EtcCustomerController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/Etc/EtcCustomerController.java @@ -8,16 +8,16 @@ import com.hai.common.security.SessionObject; import com.hai.common.security.UserCenter; import com.hai.common.utils.ResponseMsgUtil; import com.hai.config.EtcService; -import com.hai.entity.EtcCarMsg; -import com.hai.entity.EtcContractOrder; -import com.hai.entity.EtcCustMsg; -import com.hai.entity.SecDictionary; +import com.hai.entity.*; import com.hai.etc.EtcCarMsgService; import com.hai.etc.EtcCustMsgService; import com.hai.model.HighUserModel; import com.hai.model.ResponseData; import com.hai.model.UserInfoModel; import com.hai.service.CommonService; +import com.hai.service.HighDiscountPackageDetailsService; +import com.hai.service.HighDiscountPackageService; +import com.hai.service.SecConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -28,6 +28,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.*; + @RestController @RequestMapping(value="/etcCustomer") @Api(value="etc客户信息") @@ -44,6 +45,16 @@ public class EtcCustomerController { @Resource private EtcCarMsgService etcCarMsgService; + + @Resource + private SecConfigService secConfigService; + + @Resource + private HighDiscountPackageService highDiscountPackageService; + + @Resource + private HighDiscountPackageDetailsService highDiscountPackageDetailsService; + @RequestMapping(value = "/getEtcCarMsgList", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询车辆列表") @@ -151,9 +162,23 @@ public class EtcCustomerController { } // 查询微信签约代扣信息 + JSONObject object = EtcService.checkNeedSignWechatWithhold( contractOrder.getProductId() , contractOrder.getCardVarietyId()); + if (object.getString("errCode").equals("0")) { + contractOrder.setWechatSign(object.getJSONObject("result").getBoolean("alreadySignFlag")? 1:0); + contractOrder.setNeedSignWechat(object.getJSONObject("result").getBoolean("needSignFlag")? 1:0); + contractOrder.setAppid(object.getJSONObject("result").getString("appId")); + contractOrder.setJumpPath(object.getJSONObject("result").getString("path")); + } + // 查询银行签约代扣 + JSONObject objectBank = EtcService.checkSignWithhold( contractOrder.getCustId()); + if (objectBank.getString("errCode").equals("0")) { + contractOrder.setBankSign(objectBank.getJSONObject("result").getBoolean("isSign")? 1:0); + } - return ResponseMsgUtil.success(etcCarMsgService.findContractOrderById(id)); + etcCarMsgService.updateContractOrder(contractOrder); + + return ResponseMsgUtil.success(contractOrder); } catch (Exception e) { log.error("BsMsgController --> getMsgByList() error!", e); @@ -368,6 +393,35 @@ public class EtcCustomerController { } } + @RequestMapping(value = "/getEquity", method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "签约银行卡代扣") + public ResponseData getEquity() { + try { + + List list = new ArrayList<>(); + + // 查询赠送优惠券 + SecConfig secConfig = secConfigService.findByCodeType("GIVE_DISCOUNT_PACKAGE"); + String[] s = secConfig.getCodeValue().split(","); + + for (String code : s) { + JSONObject object = new JSONObject(); + object.put("packageDetail" , highDiscountPackageService.findDiscountPackageById(Integer.valueOf(code))); + object.put("discountList" , highDiscountPackageDetailsService.getDetailByPackage(Integer.valueOf(code))); + list.add(object); + } + + return ResponseMsgUtil.success(list); + + } catch (Exception e) { + log.error("HighUserController --> findByUserId() error!", e); + return ResponseMsgUtil.exception(e); + } + } + + + diff --git a/hai-service/src/main/java/com/hai/dao/EtcContractOrderMapper.java b/hai-service/src/main/java/com/hai/dao/EtcContractOrderMapper.java index f0efe02d..9d20562c 100644 --- a/hai-service/src/main/java/com/hai/dao/EtcContractOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/EtcContractOrderMapper.java @@ -47,9 +47,9 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt { "`status`, pay_status, ", "sign_status, bank_sign, ", "wechat_sign, need_sign_wechat, ", - "veh_status, op_id, ", - "op_name, ext_1, ext_2, ", - "ext_3)", + "veh_status, jump_path, ", + "appId, op_id, op_name, ", + "ext_1, ext_2, ext_3)", "values (#{phone,jdbcType=VARCHAR}, #{contractNo,jdbcType=VARCHAR}, ", "#{custId,jdbcType=VARCHAR}, #{vehId,jdbcType=VARCHAR}, #{productId,jdbcType=INTEGER}, ", "#{cardVarietyId,jdbcType=INTEGER}, #{productName,jdbcType=VARCHAR}, ", @@ -57,10 +57,10 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt { "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", "#{status,jdbcType=INTEGER}, #{payStatus,jdbcType=INTEGER}, ", "#{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})" + "#{wechatSign,jdbcType=INTEGER}, #{needSignWechat,jdbcType=INTEGER}, ", + "#{vehStatus,jdbcType=INTEGER}, #{jumpPath,jdbcType=VARCHAR}, ", + "#{appid,jdbcType=VARCHAR}, #{opId,jdbcType=BIGINT}, #{opName,jdbcType=VARCHAR}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(EtcContractOrder record); @@ -88,8 +88,10 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt { @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="need_sign_wechat", property="needSignWechat", jdbcType=JdbcType.INTEGER), @Result(column="veh_status", property="vehStatus", jdbcType=JdbcType.INTEGER), + @Result(column="jump_path", property="jumpPath", jdbcType=JdbcType.VARCHAR), + @Result(column="appId", property="appid", jdbcType=JdbcType.VARCHAR), @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), @@ -102,8 +104,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, bank_sign, wechat_sign, need_sign_wechat, veh_status, op_id, op_name, ", - "ext_1, ext_2, ext_3", + "sign_status, bank_sign, wechat_sign, need_sign_wechat, veh_status, jump_path, ", + "appId, op_id, op_name, ext_1, ext_2, ext_3", "from etc_contract_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -125,8 +127,10 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt { @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="need_sign_wechat", property="needSignWechat", jdbcType=JdbcType.INTEGER), @Result(column="veh_status", property="vehStatus", jdbcType=JdbcType.INTEGER), + @Result(column="jump_path", property="jumpPath", jdbcType=JdbcType.VARCHAR), + @Result(column="appId", property="appid", jdbcType=JdbcType.VARCHAR), @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), @@ -162,8 +166,10 @@ public interface EtcContractOrderMapper extends EtcContractOrderMapperExt { "sign_status = #{signStatus,jdbcType=INTEGER},", "bank_sign = #{bankSign,jdbcType=INTEGER},", "wechat_sign = #{wechatSign,jdbcType=INTEGER},", - "need_sign_wechat = #{needSignWechat,jdbcType=VARCHAR},", + "need_sign_wechat = #{needSignWechat,jdbcType=INTEGER},", "veh_status = #{vehStatus,jdbcType=INTEGER},", + "jump_path = #{jumpPath,jdbcType=VARCHAR},", + "appId = #{appid,jdbcType=VARCHAR},", "op_id = #{opId,jdbcType=BIGINT},", "op_name = #{opName,jdbcType=VARCHAR},", "ext_1 = #{ext1,jdbcType=VARCHAR},", diff --git a/hai-service/src/main/java/com/hai/dao/EtcContractOrderSqlProvider.java b/hai-service/src/main/java/com/hai/dao/EtcContractOrderSqlProvider.java index 66795c1b..3c6af594 100644 --- a/hai-service/src/main/java/com/hai/dao/EtcContractOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/EtcContractOrderSqlProvider.java @@ -93,13 +93,21 @@ public class EtcContractOrderSqlProvider { } if (record.getNeedSignWechat() != null) { - sql.VALUES("need_sign_wechat", "#{needSignWechat,jdbcType=VARCHAR}"); + sql.VALUES("need_sign_wechat", "#{needSignWechat,jdbcType=INTEGER}"); } if (record.getVehStatus() != null) { sql.VALUES("veh_status", "#{vehStatus,jdbcType=INTEGER}"); } + if (record.getJumpPath() != null) { + sql.VALUES("jump_path", "#{jumpPath,jdbcType=VARCHAR}"); + } + + if (record.getAppid() != null) { + sql.VALUES("appId", "#{appid,jdbcType=VARCHAR}"); + } + if (record.getOpId() != null) { sql.VALUES("op_id", "#{opId,jdbcType=BIGINT}"); } @@ -148,6 +156,8 @@ public class EtcContractOrderSqlProvider { sql.SELECT("wechat_sign"); sql.SELECT("need_sign_wechat"); sql.SELECT("veh_status"); + sql.SELECT("jump_path"); + sql.SELECT("appId"); sql.SELECT("op_id"); sql.SELECT("op_name"); sql.SELECT("ext_1"); @@ -239,13 +249,21 @@ public class EtcContractOrderSqlProvider { } if (record.getNeedSignWechat() != null) { - sql.SET("need_sign_wechat = #{record.needSignWechat,jdbcType=VARCHAR}"); + sql.SET("need_sign_wechat = #{record.needSignWechat,jdbcType=INTEGER}"); } if (record.getVehStatus() != null) { sql.SET("veh_status = #{record.vehStatus,jdbcType=INTEGER}"); } + if (record.getJumpPath() != null) { + sql.SET("jump_path = #{record.jumpPath,jdbcType=VARCHAR}"); + } + + if (record.getAppid() != null) { + sql.SET("appId = #{record.appid,jdbcType=VARCHAR}"); + } + if (record.getOpId() != null) { sql.SET("op_id = #{record.opId,jdbcType=BIGINT}"); } @@ -291,8 +309,10 @@ public class EtcContractOrderSqlProvider { 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("need_sign_wechat = #{record.needSignWechat,jdbcType=INTEGER}"); sql.SET("veh_status = #{record.vehStatus,jdbcType=INTEGER}"); + sql.SET("jump_path = #{record.jumpPath,jdbcType=VARCHAR}"); + sql.SET("appId = #{record.appid,jdbcType=VARCHAR}"); sql.SET("op_id = #{record.opId,jdbcType=BIGINT}"); sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); @@ -373,13 +393,21 @@ public class EtcContractOrderSqlProvider { } if (record.getNeedSignWechat() != null) { - sql.SET("need_sign_wechat = #{needSignWechat,jdbcType=VARCHAR}"); + sql.SET("need_sign_wechat = #{needSignWechat,jdbcType=INTEGER}"); } if (record.getVehStatus() != null) { sql.SET("veh_status = #{vehStatus,jdbcType=INTEGER}"); } + if (record.getJumpPath() != null) { + sql.SET("jump_path = #{jumpPath,jdbcType=VARCHAR}"); + } + + if (record.getAppid() != null) { + sql.SET("appId = #{appid,jdbcType=VARCHAR}"); + } + if (record.getOpId() != null) { sql.SET("op_id = #{opId,jdbcType=BIGINT}"); } diff --git a/hai-service/src/main/java/com/hai/entity/EtcContractOrder.java b/hai-service/src/main/java/com/hai/entity/EtcContractOrder.java index 01af03fe..cef52668 100644 --- a/hai-service/src/main/java/com/hai/entity/EtcContractOrder.java +++ b/hai-service/src/main/java/com/hai/entity/EtcContractOrder.java @@ -101,13 +101,23 @@ public class EtcContractOrder implements Serializable { /** * 是否需要签约微信代扣 1 需要 ， 0：不需要 */ - private String needSignWechat; + private Integer needSignWechat; /** * 11:待审核,12:待推送,13:已推送高速审核,15:待激活,20:已激活(已启用),21:已停用,22:已挂起,23:已挂失,28:注销审核中,29:注销中,30:已注销,31:审核拒绝,32:已取消,33:高速已拒绝 */ private Integer vehStatus; + /** + * 跳转路径 + */ + private String jumpPath; + + /** + * appid + */ + private String appid; + /** * 操作人 */ @@ -271,11 +281,11 @@ public class EtcContractOrder implements Serializable { this.wechatSign = wechatSign; } - public String getNeedSignWechat() { + public Integer getNeedSignWechat() { return needSignWechat; } - public void setNeedSignWechat(String needSignWechat) { + public void setNeedSignWechat(Integer needSignWechat) { this.needSignWechat = needSignWechat; } @@ -287,6 +297,22 @@ public class EtcContractOrder implements Serializable { this.vehStatus = vehStatus; } + public String getJumpPath() { + return jumpPath; + } + + public void setJumpPath(String jumpPath) { + this.jumpPath = jumpPath; + } + + public String getAppid() { + return appid; + } + + public void setAppid(String appid) { + this.appid = appid; + } + public Long getOpId() { return opId; } @@ -358,6 +384,8 @@ public class EtcContractOrder implements Serializable { && (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.getJumpPath() == null ? other.getJumpPath() == null : this.getJumpPath().equals(other.getJumpPath())) + && (this.getAppid() == null ? other.getAppid() == null : this.getAppid().equals(other.getAppid())) && (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())) @@ -388,6 +416,8 @@ public class EtcContractOrder implements Serializable { 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 + ((getJumpPath() == null) ? 0 : getJumpPath().hashCode()); + result = prime * result + ((getAppid() == null) ? 0 : getAppid().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()); @@ -421,6 +451,8 @@ public class EtcContractOrder implements Serializable { sb.append(", wechatSign=").append(wechatSign); sb.append(", needSignWechat=").append(needSignWechat); sb.append(", vehStatus=").append(vehStatus); + sb.append(", jumpPath=").append(jumpPath); + sb.append(", appid=").append(appid); sb.append(", opId=").append(opId); sb.append(", opName=").append(opName); sb.append(", ext1=").append(ext1); diff --git a/hai-service/src/main/java/com/hai/entity/EtcContractOrderExample.java b/hai-service/src/main/java/com/hai/entity/EtcContractOrderExample.java index e716266d..0c9a4e08 100644 --- a/hai-service/src/main/java/com/hai/entity/EtcContractOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/EtcContractOrderExample.java @@ -1225,62 +1225,52 @@ public class EtcContractOrderExample { return (Criteria) this; } - public Criteria andNeedSignWechatEqualTo(String value) { + public Criteria andNeedSignWechatEqualTo(Integer value) { addCriterion("need_sign_wechat =", value, "needSignWechat"); return (Criteria) this; } - public Criteria andNeedSignWechatNotEqualTo(String value) { + public Criteria andNeedSignWechatNotEqualTo(Integer value) { addCriterion("need_sign_wechat <>", value, "needSignWechat"); return (Criteria) this; } - public Criteria andNeedSignWechatGreaterThan(String value) { + public Criteria andNeedSignWechatGreaterThan(Integer value) { addCriterion("need_sign_wechat >", value, "needSignWechat"); return (Criteria) this; } - public Criteria andNeedSignWechatGreaterThanOrEqualTo(String value) { + public Criteria andNeedSignWechatGreaterThanOrEqualTo(Integer value) { addCriterion("need_sign_wechat >=", value, "needSignWechat"); return (Criteria) this; } - public Criteria andNeedSignWechatLessThan(String value) { + public Criteria andNeedSignWechatLessThan(Integer value) { addCriterion("need_sign_wechat <", value, "needSignWechat"); return (Criteria) this; } - public Criteria andNeedSignWechatLessThanOrEqualTo(String value) { + public Criteria andNeedSignWechatLessThanOrEqualTo(Integer 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 values) { + public Criteria andNeedSignWechatIn(List values) { addCriterion("need_sign_wechat in", values, "needSignWechat"); return (Criteria) this; } - public Criteria andNeedSignWechatNotIn(List values) { + public Criteria andNeedSignWechatNotIn(List values) { addCriterion("need_sign_wechat not in", values, "needSignWechat"); return (Criteria) this; } - public Criteria andNeedSignWechatBetween(String value1, String value2) { + public Criteria andNeedSignWechatBetween(Integer value1, Integer value2) { addCriterion("need_sign_wechat between", value1, value2, "needSignWechat"); return (Criteria) this; } - public Criteria andNeedSignWechatNotBetween(String value1, String value2) { + public Criteria andNeedSignWechatNotBetween(Integer value1, Integer value2) { addCriterion("need_sign_wechat not between", value1, value2, "needSignWechat"); return (Criteria) this; } @@ -1345,6 +1335,146 @@ public class EtcContractOrderExample { return (Criteria) this; } + public Criteria andJumpPathIsNull() { + addCriterion("jump_path is null"); + return (Criteria) this; + } + + public Criteria andJumpPathIsNotNull() { + addCriterion("jump_path is not null"); + return (Criteria) this; + } + + public Criteria andJumpPathEqualTo(String value) { + addCriterion("jump_path =", value, "jumpPath"); + return (Criteria) this; + } + + public Criteria andJumpPathNotEqualTo(String value) { + addCriterion("jump_path <>", value, "jumpPath"); + return (Criteria) this; + } + + public Criteria andJumpPathGreaterThan(String value) { + addCriterion("jump_path >", value, "jumpPath"); + return (Criteria) this; + } + + public Criteria andJumpPathGreaterThanOrEqualTo(String value) { + addCriterion("jump_path >=", value, "jumpPath"); + return (Criteria) this; + } + + public Criteria andJumpPathLessThan(String value) { + addCriterion("jump_path <", value, "jumpPath"); + return (Criteria) this; + } + + public Criteria andJumpPathLessThanOrEqualTo(String value) { + addCriterion("jump_path <=", value, "jumpPath"); + return (Criteria) this; + } + + public Criteria andJumpPathLike(String value) { + addCriterion("jump_path like", value, "jumpPath"); + return (Criteria) this; + } + + public Criteria andJumpPathNotLike(String value) { + addCriterion("jump_path not like", value, "jumpPath"); + return (Criteria) this; + } + + public Criteria andJumpPathIn(List values) { + addCriterion("jump_path in", values, "jumpPath"); + return (Criteria) this; + } + + public Criteria andJumpPathNotIn(List values) { + addCriterion("jump_path not in", values, "jumpPath"); + return (Criteria) this; + } + + public Criteria andJumpPathBetween(String value1, String value2) { + addCriterion("jump_path between", value1, value2, "jumpPath"); + return (Criteria) this; + } + + public Criteria andJumpPathNotBetween(String value1, String value2) { + addCriterion("jump_path not between", value1, value2, "jumpPath"); + return (Criteria) this; + } + + public Criteria andAppidIsNull() { + addCriterion("appId is null"); + return (Criteria) this; + } + + public Criteria andAppidIsNotNull() { + addCriterion("appId is not null"); + return (Criteria) this; + } + + public Criteria andAppidEqualTo(String value) { + addCriterion("appId =", value, "appid"); + return (Criteria) this; + } + + public Criteria andAppidNotEqualTo(String value) { + addCriterion("appId <>", value, "appid"); + return (Criteria) this; + } + + public Criteria andAppidGreaterThan(String value) { + addCriterion("appId >", value, "appid"); + return (Criteria) this; + } + + public Criteria andAppidGreaterThanOrEqualTo(String value) { + addCriterion("appId >=", value, "appid"); + return (Criteria) this; + } + + public Criteria andAppidLessThan(String value) { + addCriterion("appId <", value, "appid"); + return (Criteria) this; + } + + public Criteria andAppidLessThanOrEqualTo(String value) { + addCriterion("appId <=", value, "appid"); + return (Criteria) this; + } + + public Criteria andAppidLike(String value) { + addCriterion("appId like", value, "appid"); + return (Criteria) this; + } + + public Criteria andAppidNotLike(String value) { + addCriterion("appId not like", value, "appid"); + return (Criteria) this; + } + + public Criteria andAppidIn(List values) { + addCriterion("appId in", values, "appid"); + return (Criteria) this; + } + + public Criteria andAppidNotIn(List values) { + addCriterion("appId not in", values, "appid"); + return (Criteria) this; + } + + public Criteria andAppidBetween(String value1, String value2) { + addCriterion("appId between", value1, value2, "appid"); + return (Criteria) this; + } + + public Criteria andAppidNotBetween(String value1, String value2) { + addCriterion("appId not between", value1, value2, "appid"); + return (Criteria) this; + } + public Criteria andOpIdIsNull() { addCriterion("op_id is null"); return (Criteria) this; diff --git a/hai-service/src/main/java/com/hai/etc/impl/EtcCarMsgServiceImpl.java b/hai-service/src/main/java/com/hai/etc/impl/EtcCarMsgServiceImpl.java index 91d94bda..2a056fae 100644 --- a/hai-service/src/main/java/com/hai/etc/impl/EtcCarMsgServiceImpl.java +++ b/hai-service/src/main/java/com/hai/etc/impl/EtcCarMsgServiceImpl.java @@ -53,8 +53,12 @@ public class EtcCarMsgServiceImpl implements EtcCarMsgService { contractOrder.setCardVarietyName(EtcVarietyEnum.getNameByType(etcCarMsg.getCardVarietyId())); contractOrder.setVehId(etcCarMsg.getVehId()); contractOrder.setPayStatus(1); + contractOrder.setStatus(1); contractOrder.setVehStatus(etcCarMsg.getVehStatus()); contractOrder.setSignStatus(0); + contractOrder.setBankSign(0); + contractOrder.setWechatSign(0); + contractOrder.setNeedSignWechat(0); contractOrder.setOpId(etcCarMsg.getUserId()); contractOrder.setOpName(etcCarMsg.getUserName()); diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java index 71f748fe..8a07dce5 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java @@ -1343,6 +1343,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { childOrder.setMemPhone(order.getMemPhone()); childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo()); childOrder.setGoodsType(OrderChildGoodsType.TYPE20.getNumber()); + childOrder.setSkuId(createOrderChildModel.getSkuId()); childOrder.setGoodsId(createOrderChildModel.getGoodsId()); childOrder.setGoodsName("ETC用户办理"); childOrder.setGoodsSpecName("ETC用户办理"); diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java index 5b1ec023..9a94110d 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java @@ -816,11 +816,8 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService { carMsg.setPayStatus(2); etcCarMsgService.updateEtcCar(carMsg); - // 查询赠送优惠券 - SecConfig secConfig = secConfigService.findByCodeType("GIVE_DISCOUNT_PACKAGE"); - // 赠送优惠券 - highDiscountPackageService.giveAway(Long.parseLong(secConfig.getCodeValue()) , order.getMemPhone() , 2 , order.getMemId().toString()); + highDiscountPackageService.giveAway(order.getHighChildOrderList().get(0).getSkuId() , order.getMemPhone() , 2 , order.getMemId().toString()); } diff --git a/hai-service/src/main/resources/dev/commonConfig.properties b/hai-service/src/main/resources/dev/commonConfig.properties index 767b4ce2..58131761 100644 --- a/hai-service/src/main/resources/dev/commonConfig.properties +++ b/hai-service/src/main/resources/dev/commonConfig.properties @@ -178,9 +178,9 @@ EtcPublicKey = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMyQb5gR1rweB5oHKqRPJtJjLQK EtcPrivateKey = MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAO8+KWh/OmBahFk7TWOEjPl13BT5NdlbGvQ/311Yua6CQqul9w1DIR2TwFUUh/Bko/eVoLROfF2XVjHbw2bImTdJ7y9C3511HI59YPNzqyql0DHjLxbH0VW92eUgk8mG09wtrUMu1ImN0b7aFE3uqAgz6pwh3TUiQWsDWz+l/MG7AgMBAAECgYEA7nYsOd8OpbmzT2m/omEdTwz9993KocKgZDJCBj4InftyTrrXO93cZSm/PE6BjMgTcxUuIGpWpcbRgFLHOmzZ4Qd+k/6Yb1ErMTfdGlgrxv2B+vztWYfjmFzEiXpecFH47ED6iYrrqm14X3InpnBv4rUkGdqqNbyPGgTO2ncs/3kCQQD+xqRAQSb/TROlqJdO91y6z9v0PO2GLmokqYg444rKYZKhDE0tdJeLU/sfK8SMg5+SlwdQm4nlo8EDJ/w2CEn3AkEA8GRqVkKgIuH413/a6+luYDjlf30WY7Mi1sm3QPSZ6+eH35UwsL6mdX6mjRpUN9Hez6FMfE7s3XOldoPVMzR1XQJBAOa2VTkGhtz8HEWQZOySXfuhjSogHmu7Dk2C5CO4Eg/wycpjDGSUR0NZWnfAt60S6GbjszEQmJBGeNt10xPO78MCQQCWXwnRaZ3IFDhXfQfRWFSN5ilQ5UszFGQvnUB/ZkI+ObdZmXY6qRdxGcdPLnAN9r78fDZe7/Pk1qljCDY98IuVAkEAnSeO/221gDhL1wnbUhGuX1yo8f5Eo/wDTW5cBxXFGZeexhB8I4jnEV4E/xmikkb3jDFvmrnFk+XUtDqkrvicRQ== #NUODE -NdPostUrl = https://nuode.qianbao18.com/nuode-module-supplier/ -NdOrgCode = 414a3d16-30f9-40d1-a2cd-b06066b38708 -NdKey= 4a6a6836-42f5-4ead-8629-ca1265bfb98c +NdPostUrl = http://nuode-test.yuetong18.cn/nuode-module-supplier/ +NdOrgCode = 19181483-91e9-4e13-9236-fb917ed9529d +NdKey= 5df3f620-e269-458d-9556-87e26d30256a #Sph SphPostUrl = https://api.coupon.shuangpenghui.com//business/entry