From 7c3791ac0787b4cc359040a3b031fd069c6fac29 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Thu, 26 Oct 2023 11:05:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bweb/controller/HighOrderController.java | 21 +- .../com/hai/dao/BsMerPlatformNoMapper.java | 167 ++ .../com/hai/dao/BsMerPlatformNoMapperExt.java | 7 + .../hai/dao/BsMerPlatformNoSqlProvider.java | 472 +++++ .../java/com/hai/entity/BsMerPlatformNo.java | 392 ++++ .../hai/entity/BsMerPlatformNoExample.java | 1683 +++++++++++++++++ .../impl/OrderPaySuccessServiceImpl.java | 4 + .../com/hai/service/HighOrderService.java | 7 +- .../service/impl/HighOrderServiceImpl.java | 116 +- .../pay/impl/GoodsOrderServiceImpl.java | 2 +- 10 files changed, 2809 insertions(+), 62 deletions(-) create mode 100644 hai-service/src/main/java/com/hai/dao/BsMerPlatformNoMapper.java create mode 100644 hai-service/src/main/java/com/hai/dao/BsMerPlatformNoMapperExt.java create mode 100644 hai-service/src/main/java/com/hai/dao/BsMerPlatformNoSqlProvider.java create mode 100644 hai-service/src/main/java/com/hai/entity/BsMerPlatformNo.java create mode 100644 hai-service/src/main/java/com/hai/entity/BsMerPlatformNoExample.java diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java index 93809c8e..e70d7a9e 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java @@ -17,10 +17,7 @@ import com.hai.common.security.UserCenter; import com.hai.common.utils.ResponseMsgUtil; import com.hai.common.utils.WxUtils; import com.hai.config.HuiLianTongUnionCardConfig; -import com.hai.entity.HighOrder; -import com.hai.entity.HighTyAgent; -import com.hai.entity.HighTySalesman; -import com.hai.entity.OutRechargeOrder; +import com.hai.entity.*; import com.hai.enum_type.UserObjectTypeEnum; import com.hai.model.*; import com.hai.service.*; @@ -57,6 +54,9 @@ public class HighOrderController { @Resource private HighOrderService highOrderService; + @Resource + private HighGasOrderService gasOrderService; + @Resource private HighCouponService couponService; @@ -80,15 +80,18 @@ public class HighOrderController { HighOrder order = highOrderService.getOrderById(orderId); if (order == null) { log.error("HighCouponController -> getCouponList() error!","权限不足"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); + throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_ORDER, ""); + } + + HighGasOrder gasOrder = gasOrderService.getDetailByOrderNo(order.getOrderNo()); + if (gasOrder == null) { + log.error("HighCouponController -> getCouponList() error!","权限不足"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_ORDER, ""); } - /* order.setPrintStatus(true); - order.setPrintNum(order.getPrintNum() + 1);*/ - highOrderService.updateOrderDetail(order); // 1. 热敏打印机 2. 云打印机 if (printType == 2) { - highOrderService.printGasOrder(order.getHighChildOrderList().get(0).getGoodsId(), order, true); + highOrderService.printGasOrder(order.getHighChildOrderList().get(0).getGoodsId(), gasOrder, true); } return ResponseMsgUtil.success("操作成功"); diff --git a/hai-service/src/main/java/com/hai/dao/BsMerPlatformNoMapper.java b/hai-service/src/main/java/com/hai/dao/BsMerPlatformNoMapper.java new file mode 100644 index 00000000..5033fe82 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/BsMerPlatformNoMapper.java @@ -0,0 +1,167 @@ +package com.hai.dao; + +import com.hai.entity.BsMerPlatformNo; +import com.hai.entity.BsMerPlatformNoExample; +import java.util.List; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.DeleteProvider; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.InsertProvider; +import org.apache.ibatis.annotations.Options; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.SelectProvider; +import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.UpdateProvider; +import org.apache.ibatis.type.JdbcType; +import org.springframework.stereotype.Repository; + +/** + * + * 代码由工具生成,请勿修改!!! + * 如果需要扩展请在其父类进行扩展 + * + **/ +@Repository +public interface BsMerPlatformNoMapper extends BsMerPlatformNoMapperExt { + @SelectProvider(type=BsMerPlatformNoSqlProvider.class, method="countByExample") + long countByExample(BsMerPlatformNoExample example); + + @DeleteProvider(type=BsMerPlatformNoSqlProvider.class, method="deleteByExample") + int deleteByExample(BsMerPlatformNoExample example); + + @Delete({ + "delete from bs_mer_platform_no", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into bs_mer_platform_no (company_id, agent_id, ", + "mer_id, mer_no, platform_type, ", + "platform_no, cup_no, ", + "pos_id, branch_id, ", + "mer_public_key, platform_operator_id, ", + "platform_operator_pwd, refund_cert_url, ", + "refund_cert_pwd, `status`, ", + "suggestion_reject, create_time, ", + "update_time, ext_1, ", + "ext_2, ext_3)", + "values (#{companyId,jdbcType=BIGINT}, #{agentId,jdbcType=BIGINT}, ", + "#{merId,jdbcType=BIGINT}, #{merNo,jdbcType=VARCHAR}, #{platformType,jdbcType=INTEGER}, ", + "#{platformNo,jdbcType=VARCHAR}, #{cupNo,jdbcType=VARCHAR}, ", + "#{posId,jdbcType=VARCHAR}, #{branchId,jdbcType=VARCHAR}, ", + "#{merPublicKey,jdbcType=VARCHAR}, #{platformOperatorId,jdbcType=VARCHAR}, ", + "#{platformOperatorPwd,jdbcType=VARCHAR}, #{refundCertUrl,jdbcType=VARCHAR}, ", + "#{refundCertPwd,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", + "#{suggestionReject,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(BsMerPlatformNo record); + + @InsertProvider(type=BsMerPlatformNoSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(BsMerPlatformNo record); + + @SelectProvider(type=BsMerPlatformNoSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), + @Result(column="agent_id", property="agentId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_type", property="platformType", jdbcType=JdbcType.INTEGER), + @Result(column="platform_no", property="platformNo", jdbcType=JdbcType.VARCHAR), + @Result(column="cup_no", property="cupNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pos_id", property="posId", jdbcType=JdbcType.VARCHAR), + @Result(column="branch_id", property="branchId", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_public_key", property="merPublicKey", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_operator_id", property="platformOperatorId", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_operator_pwd", property="platformOperatorPwd", jdbcType=JdbcType.VARCHAR), + @Result(column="refund_cert_url", property="refundCertUrl", jdbcType=JdbcType.VARCHAR), + @Result(column="refund_cert_pwd", property="refundCertPwd", jdbcType=JdbcType.VARCHAR), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="suggestion_reject", property="suggestionReject", jdbcType=JdbcType.VARCHAR), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + List selectByExample(BsMerPlatformNoExample example); + + @Select({ + "select", + "id, company_id, agent_id, mer_id, mer_no, platform_type, platform_no, cup_no, ", + "pos_id, branch_id, mer_public_key, platform_operator_id, platform_operator_pwd, ", + "refund_cert_url, refund_cert_pwd, `status`, suggestion_reject, create_time, ", + "update_time, ext_1, ext_2, ext_3", + "from bs_mer_platform_no", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), + @Result(column="agent_id", property="agentId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_type", property="platformType", jdbcType=JdbcType.INTEGER), + @Result(column="platform_no", property="platformNo", jdbcType=JdbcType.VARCHAR), + @Result(column="cup_no", property="cupNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pos_id", property="posId", jdbcType=JdbcType.VARCHAR), + @Result(column="branch_id", property="branchId", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_public_key", property="merPublicKey", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_operator_id", property="platformOperatorId", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_operator_pwd", property="platformOperatorPwd", jdbcType=JdbcType.VARCHAR), + @Result(column="refund_cert_url", property="refundCertUrl", jdbcType=JdbcType.VARCHAR), + @Result(column="refund_cert_pwd", property="refundCertPwd", jdbcType=JdbcType.VARCHAR), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="suggestion_reject", property="suggestionReject", jdbcType=JdbcType.VARCHAR), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + BsMerPlatformNo selectByPrimaryKey(Long id); + + @UpdateProvider(type=BsMerPlatformNoSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") BsMerPlatformNo record, @Param("example") BsMerPlatformNoExample example); + + @UpdateProvider(type=BsMerPlatformNoSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") BsMerPlatformNo record, @Param("example") BsMerPlatformNoExample example); + + @UpdateProvider(type=BsMerPlatformNoSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(BsMerPlatformNo record); + + @Update({ + "update bs_mer_platform_no", + "set company_id = #{companyId,jdbcType=BIGINT},", + "agent_id = #{agentId,jdbcType=BIGINT},", + "mer_id = #{merId,jdbcType=BIGINT},", + "mer_no = #{merNo,jdbcType=VARCHAR},", + "platform_type = #{platformType,jdbcType=INTEGER},", + "platform_no = #{platformNo,jdbcType=VARCHAR},", + "cup_no = #{cupNo,jdbcType=VARCHAR},", + "pos_id = #{posId,jdbcType=VARCHAR},", + "branch_id = #{branchId,jdbcType=VARCHAR},", + "mer_public_key = #{merPublicKey,jdbcType=VARCHAR},", + "platform_operator_id = #{platformOperatorId,jdbcType=VARCHAR},", + "platform_operator_pwd = #{platformOperatorPwd,jdbcType=VARCHAR},", + "refund_cert_url = #{refundCertUrl,jdbcType=VARCHAR},", + "refund_cert_pwd = #{refundCertPwd,jdbcType=VARCHAR},", + "`status` = #{status,jdbcType=INTEGER},", + "suggestion_reject = #{suggestionReject,jdbcType=VARCHAR},", + "create_time = #{createTime,jdbcType=TIMESTAMP},", + "update_time = #{updateTime,jdbcType=TIMESTAMP},", + "ext_1 = #{ext1,jdbcType=VARCHAR},", + "ext_2 = #{ext2,jdbcType=VARCHAR},", + "ext_3 = #{ext3,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=BIGINT}" + }) + int updateByPrimaryKey(BsMerPlatformNo record); +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/BsMerPlatformNoMapperExt.java b/hai-service/src/main/java/com/hai/dao/BsMerPlatformNoMapperExt.java new file mode 100644 index 00000000..f40574d0 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/BsMerPlatformNoMapperExt.java @@ -0,0 +1,7 @@ +package com.hai.dao; + +/** + * mapper扩展类 + */ +public interface BsMerPlatformNoMapperExt { +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/BsMerPlatformNoSqlProvider.java b/hai-service/src/main/java/com/hai/dao/BsMerPlatformNoSqlProvider.java new file mode 100644 index 00000000..bbbb9b3f --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/BsMerPlatformNoSqlProvider.java @@ -0,0 +1,472 @@ +package com.hai.dao; + +import com.hai.entity.BsMerPlatformNo; +import com.hai.entity.BsMerPlatformNoExample.Criteria; +import com.hai.entity.BsMerPlatformNoExample.Criterion; +import com.hai.entity.BsMerPlatformNoExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class BsMerPlatformNoSqlProvider { + + public String countByExample(BsMerPlatformNoExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("bs_mer_platform_no"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(BsMerPlatformNoExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("bs_mer_platform_no"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(BsMerPlatformNo record) { + SQL sql = new SQL(); + sql.INSERT_INTO("bs_mer_platform_no"); + + if (record.getCompanyId() != null) { + sql.VALUES("company_id", "#{companyId,jdbcType=BIGINT}"); + } + + if (record.getAgentId() != null) { + sql.VALUES("agent_id", "#{agentId,jdbcType=BIGINT}"); + } + + if (record.getMerId() != null) { + sql.VALUES("mer_id", "#{merId,jdbcType=BIGINT}"); + } + + if (record.getMerNo() != null) { + sql.VALUES("mer_no", "#{merNo,jdbcType=VARCHAR}"); + } + + if (record.getPlatformType() != null) { + sql.VALUES("platform_type", "#{platformType,jdbcType=INTEGER}"); + } + + if (record.getPlatformNo() != null) { + sql.VALUES("platform_no", "#{platformNo,jdbcType=VARCHAR}"); + } + + if (record.getCupNo() != null) { + sql.VALUES("cup_no", "#{cupNo,jdbcType=VARCHAR}"); + } + + if (record.getPosId() != null) { + sql.VALUES("pos_id", "#{posId,jdbcType=VARCHAR}"); + } + + if (record.getBranchId() != null) { + sql.VALUES("branch_id", "#{branchId,jdbcType=VARCHAR}"); + } + + if (record.getMerPublicKey() != null) { + sql.VALUES("mer_public_key", "#{merPublicKey,jdbcType=VARCHAR}"); + } + + if (record.getPlatformOperatorId() != null) { + sql.VALUES("platform_operator_id", "#{platformOperatorId,jdbcType=VARCHAR}"); + } + + if (record.getPlatformOperatorPwd() != null) { + sql.VALUES("platform_operator_pwd", "#{platformOperatorPwd,jdbcType=VARCHAR}"); + } + + if (record.getRefundCertUrl() != null) { + sql.VALUES("refund_cert_url", "#{refundCertUrl,jdbcType=VARCHAR}"); + } + + if (record.getRefundCertPwd() != null) { + sql.VALUES("refund_cert_pwd", "#{refundCertPwd,jdbcType=VARCHAR}"); + } + + if (record.getStatus() != null) { + sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); + } + + if (record.getSuggestionReject() != null) { + sql.VALUES("suggestion_reject", "#{suggestionReject,jdbcType=VARCHAR}"); + } + + if (record.getCreateTime() != null) { + sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}"); + } + + return sql.toString(); + } + + public String selectByExample(BsMerPlatformNoExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("company_id"); + sql.SELECT("agent_id"); + sql.SELECT("mer_id"); + sql.SELECT("mer_no"); + sql.SELECT("platform_type"); + sql.SELECT("platform_no"); + sql.SELECT("cup_no"); + sql.SELECT("pos_id"); + sql.SELECT("branch_id"); + sql.SELECT("mer_public_key"); + sql.SELECT("platform_operator_id"); + sql.SELECT("platform_operator_pwd"); + sql.SELECT("refund_cert_url"); + sql.SELECT("refund_cert_pwd"); + sql.SELECT("`status`"); + sql.SELECT("suggestion_reject"); + sql.SELECT("create_time"); + sql.SELECT("update_time"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.FROM("bs_mer_platform_no"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + BsMerPlatformNo record = (BsMerPlatformNo) parameter.get("record"); + BsMerPlatformNoExample example = (BsMerPlatformNoExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("bs_mer_platform_no"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getCompanyId() != null) { + sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); + } + + if (record.getAgentId() != null) { + sql.SET("agent_id = #{record.agentId,jdbcType=BIGINT}"); + } + + if (record.getMerId() != null) { + sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); + } + + if (record.getMerNo() != null) { + sql.SET("mer_no = #{record.merNo,jdbcType=VARCHAR}"); + } + + if (record.getPlatformType() != null) { + sql.SET("platform_type = #{record.platformType,jdbcType=INTEGER}"); + } + + if (record.getPlatformNo() != null) { + sql.SET("platform_no = #{record.platformNo,jdbcType=VARCHAR}"); + } + + if (record.getCupNo() != null) { + sql.SET("cup_no = #{record.cupNo,jdbcType=VARCHAR}"); + } + + if (record.getPosId() != null) { + sql.SET("pos_id = #{record.posId,jdbcType=VARCHAR}"); + } + + if (record.getBranchId() != null) { + sql.SET("branch_id = #{record.branchId,jdbcType=VARCHAR}"); + } + + if (record.getMerPublicKey() != null) { + sql.SET("mer_public_key = #{record.merPublicKey,jdbcType=VARCHAR}"); + } + + if (record.getPlatformOperatorId() != null) { + sql.SET("platform_operator_id = #{record.platformOperatorId,jdbcType=VARCHAR}"); + } + + if (record.getPlatformOperatorPwd() != null) { + sql.SET("platform_operator_pwd = #{record.platformOperatorPwd,jdbcType=VARCHAR}"); + } + + if (record.getRefundCertUrl() != null) { + sql.SET("refund_cert_url = #{record.refundCertUrl,jdbcType=VARCHAR}"); + } + + if (record.getRefundCertPwd() != null) { + sql.SET("refund_cert_pwd = #{record.refundCertPwd,jdbcType=VARCHAR}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + } + + if (record.getSuggestionReject() != null) { + sql.SET("suggestion_reject = #{record.suggestionReject,jdbcType=VARCHAR}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + } + + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByExample(Map parameter) { + SQL sql = new SQL(); + sql.UPDATE("bs_mer_platform_no"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); + sql.SET("agent_id = #{record.agentId,jdbcType=BIGINT}"); + sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); + sql.SET("mer_no = #{record.merNo,jdbcType=VARCHAR}"); + sql.SET("platform_type = #{record.platformType,jdbcType=INTEGER}"); + sql.SET("platform_no = #{record.platformNo,jdbcType=VARCHAR}"); + sql.SET("cup_no = #{record.cupNo,jdbcType=VARCHAR}"); + sql.SET("pos_id = #{record.posId,jdbcType=VARCHAR}"); + sql.SET("branch_id = #{record.branchId,jdbcType=VARCHAR}"); + sql.SET("mer_public_key = #{record.merPublicKey,jdbcType=VARCHAR}"); + sql.SET("platform_operator_id = #{record.platformOperatorId,jdbcType=VARCHAR}"); + sql.SET("platform_operator_pwd = #{record.platformOperatorPwd,jdbcType=VARCHAR}"); + sql.SET("refund_cert_url = #{record.refundCertUrl,jdbcType=VARCHAR}"); + sql.SET("refund_cert_pwd = #{record.refundCertPwd,jdbcType=VARCHAR}"); + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + sql.SET("suggestion_reject = #{record.suggestionReject,jdbcType=VARCHAR}"); + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + + BsMerPlatformNoExample example = (BsMerPlatformNoExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(BsMerPlatformNo record) { + SQL sql = new SQL(); + sql.UPDATE("bs_mer_platform_no"); + + if (record.getCompanyId() != null) { + sql.SET("company_id = #{companyId,jdbcType=BIGINT}"); + } + + if (record.getAgentId() != null) { + sql.SET("agent_id = #{agentId,jdbcType=BIGINT}"); + } + + if (record.getMerId() != null) { + sql.SET("mer_id = #{merId,jdbcType=BIGINT}"); + } + + if (record.getMerNo() != null) { + sql.SET("mer_no = #{merNo,jdbcType=VARCHAR}"); + } + + if (record.getPlatformType() != null) { + sql.SET("platform_type = #{platformType,jdbcType=INTEGER}"); + } + + if (record.getPlatformNo() != null) { + sql.SET("platform_no = #{platformNo,jdbcType=VARCHAR}"); + } + + if (record.getCupNo() != null) { + sql.SET("cup_no = #{cupNo,jdbcType=VARCHAR}"); + } + + if (record.getPosId() != null) { + sql.SET("pos_id = #{posId,jdbcType=VARCHAR}"); + } + + if (record.getBranchId() != null) { + sql.SET("branch_id = #{branchId,jdbcType=VARCHAR}"); + } + + if (record.getMerPublicKey() != null) { + sql.SET("mer_public_key = #{merPublicKey,jdbcType=VARCHAR}"); + } + + if (record.getPlatformOperatorId() != null) { + sql.SET("platform_operator_id = #{platformOperatorId,jdbcType=VARCHAR}"); + } + + if (record.getPlatformOperatorPwd() != null) { + sql.SET("platform_operator_pwd = #{platformOperatorPwd,jdbcType=VARCHAR}"); + } + + if (record.getRefundCertUrl() != null) { + sql.SET("refund_cert_url = #{refundCertUrl,jdbcType=VARCHAR}"); + } + + if (record.getRefundCertPwd() != null) { + sql.SET("refund_cert_pwd = #{refundCertPwd,jdbcType=VARCHAR}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{status,jdbcType=INTEGER}"); + } + + if (record.getSuggestionReject() != null) { + sql.SET("suggestion_reject = #{suggestionReject,jdbcType=VARCHAR}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); + } + + sql.WHERE("id = #{id,jdbcType=BIGINT}"); + + return sql.toString(); + } + + protected void applyWhere(SQL sql, BsMerPlatformNoExample example, boolean includeExamplePhrase) { + if (example == null) { + return; + } + + String parmPhrase1; + String parmPhrase1_th; + String parmPhrase2; + String parmPhrase2_th; + String parmPhrase3; + String parmPhrase3_th; + if (includeExamplePhrase) { + parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } else { + parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } + + StringBuilder sb = new StringBuilder(); + List oredCriteria = example.getOredCriteria(); + boolean firstCriteria = true; + for (int i = 0; i < oredCriteria.size(); i++) { + Criteria criteria = oredCriteria.get(i); + if (criteria.isValid()) { + if (firstCriteria) { + firstCriteria = false; + } else { + sb.append(" or "); + } + + sb.append('('); + List criterions = criteria.getAllCriteria(); + boolean firstCriterion = true; + for (int j = 0; j < criterions.size(); j++) { + Criterion criterion = criterions.get(j); + if (firstCriterion) { + firstCriterion = false; + } else { + sb.append(" and "); + } + + if (criterion.isNoValue()) { + sb.append(criterion.getCondition()); + } else if (criterion.isSingleValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j)); + } else { + sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler())); + } + } else if (criterion.isBetweenValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j)); + } else { + sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler())); + } + } else if (criterion.isListValue()) { + sb.append(criterion.getCondition()); + sb.append(" ("); + List listItems = (List) criterion.getValue(); + boolean comma = false; + for (int k = 0; k < listItems.size(); k++) { + if (comma) { + sb.append(", "); + } else { + comma = true; + } + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase3, i, j, k)); + } else { + sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler())); + } + } + sb.append(')'); + } + } + sb.append(')'); + } + } + + if (sb.length() > 0) { + sql.WHERE(sb.toString()); + } + } +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/BsMerPlatformNo.java b/hai-service/src/main/java/com/hai/entity/BsMerPlatformNo.java new file mode 100644 index 00000000..40c66ea9 --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/BsMerPlatformNo.java @@ -0,0 +1,392 @@ +package com.hai.entity; + +import java.io.Serializable; +import java.util.Date; + +/** + * bs_mer_platform_no + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class BsMerPlatformNo implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 公司id + */ + private Long companyId; + + /** + * 代理商id + */ + private Long agentId; + + /** + * 商户id + */ + private Long merId; + + /** + * 内部商户号 + */ + private String merNo; + + /** + * 平台 1：拉卡拉 + */ + private Integer platformType; + + /** + * 平台商户号 + */ + private String platformNo; + + /** + * 银联商户号 + */ + private String cupNo; + + /** + * 柜台号 + */ + private String posId; + + /** + * 分行号 + */ + private String branchId; + + /** + * 商户公钥 + */ + private String merPublicKey; + + /** + * 平台操作人员编号 + */ + private String platformOperatorId; + + /** + * 平台操作人员密码 + */ + private String platformOperatorPwd; + + /** + * 退款证书地址 + */ + private String refundCertUrl; + + /** + * 退款证书秘钥 + */ + private String refundCertPwd; + + /** + * 状态 0：不可用 1：可用 2： 审核中 3：审核驳回 + */ + private Integer status; + + /** + * 审核驳回原因 + */ + private String suggestionReject; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + private String ext1; + + private String ext2; + + private String ext3; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public Long getAgentId() { + return agentId; + } + + public void setAgentId(Long agentId) { + this.agentId = agentId; + } + + public Long getMerId() { + return merId; + } + + public void setMerId(Long merId) { + this.merId = merId; + } + + public String getMerNo() { + return merNo; + } + + public void setMerNo(String merNo) { + this.merNo = merNo; + } + + public Integer getPlatformType() { + return platformType; + } + + public void setPlatformType(Integer platformType) { + this.platformType = platformType; + } + + public String getPlatformNo() { + return platformNo; + } + + public void setPlatformNo(String platformNo) { + this.platformNo = platformNo; + } + + public String getCupNo() { + return cupNo; + } + + public void setCupNo(String cupNo) { + this.cupNo = cupNo; + } + + public String getPosId() { + return posId; + } + + public void setPosId(String posId) { + this.posId = posId; + } + + public String getBranchId() { + return branchId; + } + + public void setBranchId(String branchId) { + this.branchId = branchId; + } + + public String getMerPublicKey() { + return merPublicKey; + } + + public void setMerPublicKey(String merPublicKey) { + this.merPublicKey = merPublicKey; + } + + public String getPlatformOperatorId() { + return platformOperatorId; + } + + public void setPlatformOperatorId(String platformOperatorId) { + this.platformOperatorId = platformOperatorId; + } + + public String getPlatformOperatorPwd() { + return platformOperatorPwd; + } + + public void setPlatformOperatorPwd(String platformOperatorPwd) { + this.platformOperatorPwd = platformOperatorPwd; + } + + public String getRefundCertUrl() { + return refundCertUrl; + } + + public void setRefundCertUrl(String refundCertUrl) { + this.refundCertUrl = refundCertUrl; + } + + public String getRefundCertPwd() { + return refundCertPwd; + } + + public void setRefundCertPwd(String refundCertPwd) { + this.refundCertPwd = refundCertPwd; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getSuggestionReject() { + return suggestionReject; + } + + public void setSuggestionReject(String suggestionReject) { + this.suggestionReject = suggestionReject; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getExt1() { + return ext1; + } + + public void setExt1(String ext1) { + this.ext1 = ext1; + } + + public String getExt2() { + return ext2; + } + + public void setExt2(String ext2) { + this.ext2 = ext2; + } + + public String getExt3() { + return ext3; + } + + public void setExt3(String ext3) { + this.ext3 = ext3; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + BsMerPlatformNo other = (BsMerPlatformNo) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) + && (this.getAgentId() == null ? other.getAgentId() == null : this.getAgentId().equals(other.getAgentId())) + && (this.getMerId() == null ? other.getMerId() == null : this.getMerId().equals(other.getMerId())) + && (this.getMerNo() == null ? other.getMerNo() == null : this.getMerNo().equals(other.getMerNo())) + && (this.getPlatformType() == null ? other.getPlatformType() == null : this.getPlatformType().equals(other.getPlatformType())) + && (this.getPlatformNo() == null ? other.getPlatformNo() == null : this.getPlatformNo().equals(other.getPlatformNo())) + && (this.getCupNo() == null ? other.getCupNo() == null : this.getCupNo().equals(other.getCupNo())) + && (this.getPosId() == null ? other.getPosId() == null : this.getPosId().equals(other.getPosId())) + && (this.getBranchId() == null ? other.getBranchId() == null : this.getBranchId().equals(other.getBranchId())) + && (this.getMerPublicKey() == null ? other.getMerPublicKey() == null : this.getMerPublicKey().equals(other.getMerPublicKey())) + && (this.getPlatformOperatorId() == null ? other.getPlatformOperatorId() == null : this.getPlatformOperatorId().equals(other.getPlatformOperatorId())) + && (this.getPlatformOperatorPwd() == null ? other.getPlatformOperatorPwd() == null : this.getPlatformOperatorPwd().equals(other.getPlatformOperatorPwd())) + && (this.getRefundCertUrl() == null ? other.getRefundCertUrl() == null : this.getRefundCertUrl().equals(other.getRefundCertUrl())) + && (this.getRefundCertPwd() == null ? other.getRefundCertPwd() == null : this.getRefundCertPwd().equals(other.getRefundCertPwd())) + && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getSuggestionReject() == null ? other.getSuggestionReject() == null : this.getSuggestionReject().equals(other.getSuggestionReject())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) + && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) + && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) + && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); + result = prime * result + ((getAgentId() == null) ? 0 : getAgentId().hashCode()); + result = prime * result + ((getMerId() == null) ? 0 : getMerId().hashCode()); + result = prime * result + ((getMerNo() == null) ? 0 : getMerNo().hashCode()); + result = prime * result + ((getPlatformType() == null) ? 0 : getPlatformType().hashCode()); + result = prime * result + ((getPlatformNo() == null) ? 0 : getPlatformNo().hashCode()); + result = prime * result + ((getCupNo() == null) ? 0 : getCupNo().hashCode()); + result = prime * result + ((getPosId() == null) ? 0 : getPosId().hashCode()); + result = prime * result + ((getBranchId() == null) ? 0 : getBranchId().hashCode()); + result = prime * result + ((getMerPublicKey() == null) ? 0 : getMerPublicKey().hashCode()); + result = prime * result + ((getPlatformOperatorId() == null) ? 0 : getPlatformOperatorId().hashCode()); + result = prime * result + ((getPlatformOperatorPwd() == null) ? 0 : getPlatformOperatorPwd().hashCode()); + result = prime * result + ((getRefundCertUrl() == null) ? 0 : getRefundCertUrl().hashCode()); + result = prime * result + ((getRefundCertPwd() == null) ? 0 : getRefundCertPwd().hashCode()); + result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getSuggestionReject() == null) ? 0 : getSuggestionReject().hashCode()); + result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); + result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); + result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", companyId=").append(companyId); + sb.append(", agentId=").append(agentId); + sb.append(", merId=").append(merId); + sb.append(", merNo=").append(merNo); + sb.append(", platformType=").append(platformType); + sb.append(", platformNo=").append(platformNo); + sb.append(", cupNo=").append(cupNo); + sb.append(", posId=").append(posId); + sb.append(", branchId=").append(branchId); + sb.append(", merPublicKey=").append(merPublicKey); + sb.append(", platformOperatorId=").append(platformOperatorId); + sb.append(", platformOperatorPwd=").append(platformOperatorPwd); + sb.append(", refundCertUrl=").append(refundCertUrl); + sb.append(", refundCertPwd=").append(refundCertPwd); + sb.append(", status=").append(status); + sb.append(", suggestionReject=").append(suggestionReject); + sb.append(", createTime=").append(createTime); + sb.append(", updateTime=").append(updateTime); + sb.append(", ext1=").append(ext1); + sb.append(", ext2=").append(ext2); + sb.append(", ext3=").append(ext3); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/BsMerPlatformNoExample.java b/hai-service/src/main/java/com/hai/entity/BsMerPlatformNoExample.java new file mode 100644 index 00000000..071efc4c --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/BsMerPlatformNoExample.java @@ -0,0 +1,1683 @@ +package com.hai.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class BsMerPlatformNoExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public BsMerPlatformNoExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Integer getLimit() { + return limit; + } + + public void setOffset(Long offset) { + this.offset = offset; + } + + public Long getOffset() { + return offset; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCompanyIdIsNull() { + addCriterion("company_id is null"); + return (Criteria) this; + } + + public Criteria andCompanyIdIsNotNull() { + addCriterion("company_id is not null"); + return (Criteria) this; + } + + public Criteria andCompanyIdEqualTo(Long value) { + addCriterion("company_id =", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdNotEqualTo(Long value) { + addCriterion("company_id <>", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdGreaterThan(Long value) { + addCriterion("company_id >", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) { + addCriterion("company_id >=", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdLessThan(Long value) { + addCriterion("company_id <", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdLessThanOrEqualTo(Long value) { + addCriterion("company_id <=", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdIn(List values) { + addCriterion("company_id in", values, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdNotIn(List values) { + addCriterion("company_id not in", values, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdBetween(Long value1, Long value2) { + addCriterion("company_id between", value1, value2, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdNotBetween(Long value1, Long value2) { + addCriterion("company_id not between", value1, value2, "companyId"); + return (Criteria) this; + } + + public Criteria andAgentIdIsNull() { + addCriterion("agent_id is null"); + return (Criteria) this; + } + + public Criteria andAgentIdIsNotNull() { + addCriterion("agent_id is not null"); + return (Criteria) this; + } + + public Criteria andAgentIdEqualTo(Long value) { + addCriterion("agent_id =", value, "agentId"); + return (Criteria) this; + } + + public Criteria andAgentIdNotEqualTo(Long value) { + addCriterion("agent_id <>", value, "agentId"); + return (Criteria) this; + } + + public Criteria andAgentIdGreaterThan(Long value) { + addCriterion("agent_id >", value, "agentId"); + return (Criteria) this; + } + + public Criteria andAgentIdGreaterThanOrEqualTo(Long value) { + addCriterion("agent_id >=", value, "agentId"); + return (Criteria) this; + } + + public Criteria andAgentIdLessThan(Long value) { + addCriterion("agent_id <", value, "agentId"); + return (Criteria) this; + } + + public Criteria andAgentIdLessThanOrEqualTo(Long value) { + addCriterion("agent_id <=", value, "agentId"); + return (Criteria) this; + } + + public Criteria andAgentIdIn(List values) { + addCriterion("agent_id in", values, "agentId"); + return (Criteria) this; + } + + public Criteria andAgentIdNotIn(List values) { + addCriterion("agent_id not in", values, "agentId"); + return (Criteria) this; + } + + public Criteria andAgentIdBetween(Long value1, Long value2) { + addCriterion("agent_id between", value1, value2, "agentId"); + return (Criteria) this; + } + + public Criteria andAgentIdNotBetween(Long value1, Long value2) { + addCriterion("agent_id not between", value1, value2, "agentId"); + return (Criteria) this; + } + + public Criteria andMerIdIsNull() { + addCriterion("mer_id is null"); + return (Criteria) this; + } + + public Criteria andMerIdIsNotNull() { + addCriterion("mer_id is not null"); + return (Criteria) this; + } + + public Criteria andMerIdEqualTo(Long value) { + addCriterion("mer_id =", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotEqualTo(Long value) { + addCriterion("mer_id <>", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdGreaterThan(Long value) { + addCriterion("mer_id >", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdGreaterThanOrEqualTo(Long value) { + addCriterion("mer_id >=", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdLessThan(Long value) { + addCriterion("mer_id <", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdLessThanOrEqualTo(Long value) { + addCriterion("mer_id <=", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdIn(List values) { + addCriterion("mer_id in", values, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotIn(List values) { + addCriterion("mer_id not in", values, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdBetween(Long value1, Long value2) { + addCriterion("mer_id between", value1, value2, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotBetween(Long value1, Long value2) { + addCriterion("mer_id not between", value1, value2, "merId"); + return (Criteria) this; + } + + public Criteria andMerNoIsNull() { + addCriterion("mer_no is null"); + return (Criteria) this; + } + + public Criteria andMerNoIsNotNull() { + addCriterion("mer_no is not null"); + return (Criteria) this; + } + + public Criteria andMerNoEqualTo(String value) { + addCriterion("mer_no =", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotEqualTo(String value) { + addCriterion("mer_no <>", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoGreaterThan(String value) { + addCriterion("mer_no >", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoGreaterThanOrEqualTo(String value) { + addCriterion("mer_no >=", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoLessThan(String value) { + addCriterion("mer_no <", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoLessThanOrEqualTo(String value) { + addCriterion("mer_no <=", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoLike(String value) { + addCriterion("mer_no like", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotLike(String value) { + addCriterion("mer_no not like", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoIn(List values) { + addCriterion("mer_no in", values, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotIn(List values) { + addCriterion("mer_no not in", values, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoBetween(String value1, String value2) { + addCriterion("mer_no between", value1, value2, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotBetween(String value1, String value2) { + addCriterion("mer_no not between", value1, value2, "merNo"); + return (Criteria) this; + } + + public Criteria andPlatformTypeIsNull() { + addCriterion("platform_type is null"); + return (Criteria) this; + } + + public Criteria andPlatformTypeIsNotNull() { + addCriterion("platform_type is not null"); + return (Criteria) this; + } + + public Criteria andPlatformTypeEqualTo(Integer value) { + addCriterion("platform_type =", value, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeNotEqualTo(Integer value) { + addCriterion("platform_type <>", value, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeGreaterThan(Integer value) { + addCriterion("platform_type >", value, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("platform_type >=", value, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeLessThan(Integer value) { + addCriterion("platform_type <", value, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeLessThanOrEqualTo(Integer value) { + addCriterion("platform_type <=", value, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeIn(List values) { + addCriterion("platform_type in", values, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeNotIn(List values) { + addCriterion("platform_type not in", values, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeBetween(Integer value1, Integer value2) { + addCriterion("platform_type between", value1, value2, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformTypeNotBetween(Integer value1, Integer value2) { + addCriterion("platform_type not between", value1, value2, "platformType"); + return (Criteria) this; + } + + public Criteria andPlatformNoIsNull() { + addCriterion("platform_no is null"); + return (Criteria) this; + } + + public Criteria andPlatformNoIsNotNull() { + addCriterion("platform_no is not null"); + return (Criteria) this; + } + + public Criteria andPlatformNoEqualTo(String value) { + addCriterion("platform_no =", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoNotEqualTo(String value) { + addCriterion("platform_no <>", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoGreaterThan(String value) { + addCriterion("platform_no >", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoGreaterThanOrEqualTo(String value) { + addCriterion("platform_no >=", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoLessThan(String value) { + addCriterion("platform_no <", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoLessThanOrEqualTo(String value) { + addCriterion("platform_no <=", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoLike(String value) { + addCriterion("platform_no like", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoNotLike(String value) { + addCriterion("platform_no not like", value, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoIn(List values) { + addCriterion("platform_no in", values, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoNotIn(List values) { + addCriterion("platform_no not in", values, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoBetween(String value1, String value2) { + addCriterion("platform_no between", value1, value2, "platformNo"); + return (Criteria) this; + } + + public Criteria andPlatformNoNotBetween(String value1, String value2) { + addCriterion("platform_no not between", value1, value2, "platformNo"); + return (Criteria) this; + } + + public Criteria andCupNoIsNull() { + addCriterion("cup_no is null"); + return (Criteria) this; + } + + public Criteria andCupNoIsNotNull() { + addCriterion("cup_no is not null"); + return (Criteria) this; + } + + public Criteria andCupNoEqualTo(String value) { + addCriterion("cup_no =", value, "cupNo"); + return (Criteria) this; + } + + public Criteria andCupNoNotEqualTo(String value) { + addCriterion("cup_no <>", value, "cupNo"); + return (Criteria) this; + } + + public Criteria andCupNoGreaterThan(String value) { + addCriterion("cup_no >", value, "cupNo"); + return (Criteria) this; + } + + public Criteria andCupNoGreaterThanOrEqualTo(String value) { + addCriterion("cup_no >=", value, "cupNo"); + return (Criteria) this; + } + + public Criteria andCupNoLessThan(String value) { + addCriterion("cup_no <", value, "cupNo"); + return (Criteria) this; + } + + public Criteria andCupNoLessThanOrEqualTo(String value) { + addCriterion("cup_no <=", value, "cupNo"); + return (Criteria) this; + } + + public Criteria andCupNoLike(String value) { + addCriterion("cup_no like", value, "cupNo"); + return (Criteria) this; + } + + public Criteria andCupNoNotLike(String value) { + addCriterion("cup_no not like", value, "cupNo"); + return (Criteria) this; + } + + public Criteria andCupNoIn(List values) { + addCriterion("cup_no in", values, "cupNo"); + return (Criteria) this; + } + + public Criteria andCupNoNotIn(List values) { + addCriterion("cup_no not in", values, "cupNo"); + return (Criteria) this; + } + + public Criteria andCupNoBetween(String value1, String value2) { + addCriterion("cup_no between", value1, value2, "cupNo"); + return (Criteria) this; + } + + public Criteria andCupNoNotBetween(String value1, String value2) { + addCriterion("cup_no not between", value1, value2, "cupNo"); + return (Criteria) this; + } + + public Criteria andPosIdIsNull() { + addCriterion("pos_id is null"); + return (Criteria) this; + } + + public Criteria andPosIdIsNotNull() { + addCriterion("pos_id is not null"); + return (Criteria) this; + } + + public Criteria andPosIdEqualTo(String value) { + addCriterion("pos_id =", value, "posId"); + return (Criteria) this; + } + + public Criteria andPosIdNotEqualTo(String value) { + addCriterion("pos_id <>", value, "posId"); + return (Criteria) this; + } + + public Criteria andPosIdGreaterThan(String value) { + addCriterion("pos_id >", value, "posId"); + return (Criteria) this; + } + + public Criteria andPosIdGreaterThanOrEqualTo(String value) { + addCriterion("pos_id >=", value, "posId"); + return (Criteria) this; + } + + public Criteria andPosIdLessThan(String value) { + addCriterion("pos_id <", value, "posId"); + return (Criteria) this; + } + + public Criteria andPosIdLessThanOrEqualTo(String value) { + addCriterion("pos_id <=", value, "posId"); + return (Criteria) this; + } + + public Criteria andPosIdLike(String value) { + addCriterion("pos_id like", value, "posId"); + return (Criteria) this; + } + + public Criteria andPosIdNotLike(String value) { + addCriterion("pos_id not like", value, "posId"); + return (Criteria) this; + } + + public Criteria andPosIdIn(List values) { + addCriterion("pos_id in", values, "posId"); + return (Criteria) this; + } + + public Criteria andPosIdNotIn(List values) { + addCriterion("pos_id not in", values, "posId"); + return (Criteria) this; + } + + public Criteria andPosIdBetween(String value1, String value2) { + addCriterion("pos_id between", value1, value2, "posId"); + return (Criteria) this; + } + + public Criteria andPosIdNotBetween(String value1, String value2) { + addCriterion("pos_id not between", value1, value2, "posId"); + return (Criteria) this; + } + + public Criteria andBranchIdIsNull() { + addCriterion("branch_id is null"); + return (Criteria) this; + } + + public Criteria andBranchIdIsNotNull() { + addCriterion("branch_id is not null"); + return (Criteria) this; + } + + public Criteria andBranchIdEqualTo(String value) { + addCriterion("branch_id =", value, "branchId"); + return (Criteria) this; + } + + public Criteria andBranchIdNotEqualTo(String value) { + addCriterion("branch_id <>", value, "branchId"); + return (Criteria) this; + } + + public Criteria andBranchIdGreaterThan(String value) { + addCriterion("branch_id >", value, "branchId"); + return (Criteria) this; + } + + public Criteria andBranchIdGreaterThanOrEqualTo(String value) { + addCriterion("branch_id >=", value, "branchId"); + return (Criteria) this; + } + + public Criteria andBranchIdLessThan(String value) { + addCriterion("branch_id <", value, "branchId"); + return (Criteria) this; + } + + public Criteria andBranchIdLessThanOrEqualTo(String value) { + addCriterion("branch_id <=", value, "branchId"); + return (Criteria) this; + } + + public Criteria andBranchIdLike(String value) { + addCriterion("branch_id like", value, "branchId"); + return (Criteria) this; + } + + public Criteria andBranchIdNotLike(String value) { + addCriterion("branch_id not like", value, "branchId"); + return (Criteria) this; + } + + public Criteria andBranchIdIn(List values) { + addCriterion("branch_id in", values, "branchId"); + return (Criteria) this; + } + + public Criteria andBranchIdNotIn(List values) { + addCriterion("branch_id not in", values, "branchId"); + return (Criteria) this; + } + + public Criteria andBranchIdBetween(String value1, String value2) { + addCriterion("branch_id between", value1, value2, "branchId"); + return (Criteria) this; + } + + public Criteria andBranchIdNotBetween(String value1, String value2) { + addCriterion("branch_id not between", value1, value2, "branchId"); + return (Criteria) this; + } + + public Criteria andMerPublicKeyIsNull() { + addCriterion("mer_public_key is null"); + return (Criteria) this; + } + + public Criteria andMerPublicKeyIsNotNull() { + addCriterion("mer_public_key is not null"); + return (Criteria) this; + } + + public Criteria andMerPublicKeyEqualTo(String value) { + addCriterion("mer_public_key =", value, "merPublicKey"); + return (Criteria) this; + } + + public Criteria andMerPublicKeyNotEqualTo(String value) { + addCriterion("mer_public_key <>", value, "merPublicKey"); + return (Criteria) this; + } + + public Criteria andMerPublicKeyGreaterThan(String value) { + addCriterion("mer_public_key >", value, "merPublicKey"); + return (Criteria) this; + } + + public Criteria andMerPublicKeyGreaterThanOrEqualTo(String value) { + addCriterion("mer_public_key >=", value, "merPublicKey"); + return (Criteria) this; + } + + public Criteria andMerPublicKeyLessThan(String value) { + addCriterion("mer_public_key <", value, "merPublicKey"); + return (Criteria) this; + } + + public Criteria andMerPublicKeyLessThanOrEqualTo(String value) { + addCriterion("mer_public_key <=", value, "merPublicKey"); + return (Criteria) this; + } + + public Criteria andMerPublicKeyLike(String value) { + addCriterion("mer_public_key like", value, "merPublicKey"); + return (Criteria) this; + } + + public Criteria andMerPublicKeyNotLike(String value) { + addCriterion("mer_public_key not like", value, "merPublicKey"); + return (Criteria) this; + } + + public Criteria andMerPublicKeyIn(List values) { + addCriterion("mer_public_key in", values, "merPublicKey"); + return (Criteria) this; + } + + public Criteria andMerPublicKeyNotIn(List values) { + addCriterion("mer_public_key not in", values, "merPublicKey"); + return (Criteria) this; + } + + public Criteria andMerPublicKeyBetween(String value1, String value2) { + addCriterion("mer_public_key between", value1, value2, "merPublicKey"); + return (Criteria) this; + } + + public Criteria andMerPublicKeyNotBetween(String value1, String value2) { + addCriterion("mer_public_key not between", value1, value2, "merPublicKey"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorIdIsNull() { + addCriterion("platform_operator_id is null"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorIdIsNotNull() { + addCriterion("platform_operator_id is not null"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorIdEqualTo(String value) { + addCriterion("platform_operator_id =", value, "platformOperatorId"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorIdNotEqualTo(String value) { + addCriterion("platform_operator_id <>", value, "platformOperatorId"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorIdGreaterThan(String value) { + addCriterion("platform_operator_id >", value, "platformOperatorId"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorIdGreaterThanOrEqualTo(String value) { + addCriterion("platform_operator_id >=", value, "platformOperatorId"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorIdLessThan(String value) { + addCriterion("platform_operator_id <", value, "platformOperatorId"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorIdLessThanOrEqualTo(String value) { + addCriterion("platform_operator_id <=", value, "platformOperatorId"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorIdLike(String value) { + addCriterion("platform_operator_id like", value, "platformOperatorId"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorIdNotLike(String value) { + addCriterion("platform_operator_id not like", value, "platformOperatorId"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorIdIn(List values) { + addCriterion("platform_operator_id in", values, "platformOperatorId"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorIdNotIn(List values) { + addCriterion("platform_operator_id not in", values, "platformOperatorId"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorIdBetween(String value1, String value2) { + addCriterion("platform_operator_id between", value1, value2, "platformOperatorId"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorIdNotBetween(String value1, String value2) { + addCriterion("platform_operator_id not between", value1, value2, "platformOperatorId"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorPwdIsNull() { + addCriterion("platform_operator_pwd is null"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorPwdIsNotNull() { + addCriterion("platform_operator_pwd is not null"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorPwdEqualTo(String value) { + addCriterion("platform_operator_pwd =", value, "platformOperatorPwd"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorPwdNotEqualTo(String value) { + addCriterion("platform_operator_pwd <>", value, "platformOperatorPwd"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorPwdGreaterThan(String value) { + addCriterion("platform_operator_pwd >", value, "platformOperatorPwd"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorPwdGreaterThanOrEqualTo(String value) { + addCriterion("platform_operator_pwd >=", value, "platformOperatorPwd"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorPwdLessThan(String value) { + addCriterion("platform_operator_pwd <", value, "platformOperatorPwd"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorPwdLessThanOrEqualTo(String value) { + addCriterion("platform_operator_pwd <=", value, "platformOperatorPwd"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorPwdLike(String value) { + addCriterion("platform_operator_pwd like", value, "platformOperatorPwd"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorPwdNotLike(String value) { + addCriterion("platform_operator_pwd not like", value, "platformOperatorPwd"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorPwdIn(List values) { + addCriterion("platform_operator_pwd in", values, "platformOperatorPwd"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorPwdNotIn(List values) { + addCriterion("platform_operator_pwd not in", values, "platformOperatorPwd"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorPwdBetween(String value1, String value2) { + addCriterion("platform_operator_pwd between", value1, value2, "platformOperatorPwd"); + return (Criteria) this; + } + + public Criteria andPlatformOperatorPwdNotBetween(String value1, String value2) { + addCriterion("platform_operator_pwd not between", value1, value2, "platformOperatorPwd"); + return (Criteria) this; + } + + public Criteria andRefundCertUrlIsNull() { + addCriterion("refund_cert_url is null"); + return (Criteria) this; + } + + public Criteria andRefundCertUrlIsNotNull() { + addCriterion("refund_cert_url is not null"); + return (Criteria) this; + } + + public Criteria andRefundCertUrlEqualTo(String value) { + addCriterion("refund_cert_url =", value, "refundCertUrl"); + return (Criteria) this; + } + + public Criteria andRefundCertUrlNotEqualTo(String value) { + addCriterion("refund_cert_url <>", value, "refundCertUrl"); + return (Criteria) this; + } + + public Criteria andRefundCertUrlGreaterThan(String value) { + addCriterion("refund_cert_url >", value, "refundCertUrl"); + return (Criteria) this; + } + + public Criteria andRefundCertUrlGreaterThanOrEqualTo(String value) { + addCriterion("refund_cert_url >=", value, "refundCertUrl"); + return (Criteria) this; + } + + public Criteria andRefundCertUrlLessThan(String value) { + addCriterion("refund_cert_url <", value, "refundCertUrl"); + return (Criteria) this; + } + + public Criteria andRefundCertUrlLessThanOrEqualTo(String value) { + addCriterion("refund_cert_url <=", value, "refundCertUrl"); + return (Criteria) this; + } + + public Criteria andRefundCertUrlLike(String value) { + addCriterion("refund_cert_url like", value, "refundCertUrl"); + return (Criteria) this; + } + + public Criteria andRefundCertUrlNotLike(String value) { + addCriterion("refund_cert_url not like", value, "refundCertUrl"); + return (Criteria) this; + } + + public Criteria andRefundCertUrlIn(List values) { + addCriterion("refund_cert_url in", values, "refundCertUrl"); + return (Criteria) this; + } + + public Criteria andRefundCertUrlNotIn(List values) { + addCriterion("refund_cert_url not in", values, "refundCertUrl"); + return (Criteria) this; + } + + public Criteria andRefundCertUrlBetween(String value1, String value2) { + addCriterion("refund_cert_url between", value1, value2, "refundCertUrl"); + return (Criteria) this; + } + + public Criteria andRefundCertUrlNotBetween(String value1, String value2) { + addCriterion("refund_cert_url not between", value1, value2, "refundCertUrl"); + return (Criteria) this; + } + + public Criteria andRefundCertPwdIsNull() { + addCriterion("refund_cert_pwd is null"); + return (Criteria) this; + } + + public Criteria andRefundCertPwdIsNotNull() { + addCriterion("refund_cert_pwd is not null"); + return (Criteria) this; + } + + public Criteria andRefundCertPwdEqualTo(String value) { + addCriterion("refund_cert_pwd =", value, "refundCertPwd"); + return (Criteria) this; + } + + public Criteria andRefundCertPwdNotEqualTo(String value) { + addCriterion("refund_cert_pwd <>", value, "refundCertPwd"); + return (Criteria) this; + } + + public Criteria andRefundCertPwdGreaterThan(String value) { + addCriterion("refund_cert_pwd >", value, "refundCertPwd"); + return (Criteria) this; + } + + public Criteria andRefundCertPwdGreaterThanOrEqualTo(String value) { + addCriterion("refund_cert_pwd >=", value, "refundCertPwd"); + return (Criteria) this; + } + + public Criteria andRefundCertPwdLessThan(String value) { + addCriterion("refund_cert_pwd <", value, "refundCertPwd"); + return (Criteria) this; + } + + public Criteria andRefundCertPwdLessThanOrEqualTo(String value) { + addCriterion("refund_cert_pwd <=", value, "refundCertPwd"); + return (Criteria) this; + } + + public Criteria andRefundCertPwdLike(String value) { + addCriterion("refund_cert_pwd like", value, "refundCertPwd"); + return (Criteria) this; + } + + public Criteria andRefundCertPwdNotLike(String value) { + addCriterion("refund_cert_pwd not like", value, "refundCertPwd"); + return (Criteria) this; + } + + public Criteria andRefundCertPwdIn(List values) { + addCriterion("refund_cert_pwd in", values, "refundCertPwd"); + return (Criteria) this; + } + + public Criteria andRefundCertPwdNotIn(List values) { + addCriterion("refund_cert_pwd not in", values, "refundCertPwd"); + return (Criteria) this; + } + + public Criteria andRefundCertPwdBetween(String value1, String value2) { + addCriterion("refund_cert_pwd between", value1, value2, "refundCertPwd"); + return (Criteria) this; + } + + public Criteria andRefundCertPwdNotBetween(String value1, String value2) { + addCriterion("refund_cert_pwd not between", value1, value2, "refundCertPwd"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("`status` is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("`status` is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Integer value) { + addCriterion("`status` =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Integer value) { + addCriterion("`status` <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Integer value) { + addCriterion("`status` >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("`status` >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Integer value) { + addCriterion("`status` <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Integer value) { + addCriterion("`status` <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("`status` in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("`status` not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Integer value1, Integer value2) { + addCriterion("`status` between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Integer value1, Integer value2) { + addCriterion("`status` not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectIsNull() { + addCriterion("suggestion_reject is null"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectIsNotNull() { + addCriterion("suggestion_reject is not null"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectEqualTo(String value) { + addCriterion("suggestion_reject =", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectNotEqualTo(String value) { + addCriterion("suggestion_reject <>", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectGreaterThan(String value) { + addCriterion("suggestion_reject >", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectGreaterThanOrEqualTo(String value) { + addCriterion("suggestion_reject >=", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectLessThan(String value) { + addCriterion("suggestion_reject <", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectLessThanOrEqualTo(String value) { + addCriterion("suggestion_reject <=", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectLike(String value) { + addCriterion("suggestion_reject like", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectNotLike(String value) { + addCriterion("suggestion_reject not like", value, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectIn(List values) { + addCriterion("suggestion_reject in", values, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectNotIn(List values) { + addCriterion("suggestion_reject not in", values, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectBetween(String value1, String value2) { + addCriterion("suggestion_reject between", value1, value2, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andSuggestionRejectNotBetween(String value1, String value2) { + addCriterion("suggestion_reject not between", value1, value2, "suggestionReject"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andExt1IsNull() { + addCriterion("ext_1 is null"); + return (Criteria) this; + } + + public Criteria andExt1IsNotNull() { + addCriterion("ext_1 is not null"); + return (Criteria) this; + } + + public Criteria andExt1EqualTo(String value) { + addCriterion("ext_1 =", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotEqualTo(String value) { + addCriterion("ext_1 <>", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThan(String value) { + addCriterion("ext_1 >", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThanOrEqualTo(String value) { + addCriterion("ext_1 >=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThan(String value) { + addCriterion("ext_1 <", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThanOrEqualTo(String value) { + addCriterion("ext_1 <=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Like(String value) { + addCriterion("ext_1 like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotLike(String value) { + addCriterion("ext_1 not like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1In(List values) { + addCriterion("ext_1 in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotIn(List values) { + addCriterion("ext_1 not in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Between(String value1, String value2) { + addCriterion("ext_1 between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotBetween(String value1, String value2) { + addCriterion("ext_1 not between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt2IsNull() { + addCriterion("ext_2 is null"); + return (Criteria) this; + } + + public Criteria andExt2IsNotNull() { + addCriterion("ext_2 is not null"); + return (Criteria) this; + } + + public Criteria andExt2EqualTo(String value) { + addCriterion("ext_2 =", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotEqualTo(String value) { + addCriterion("ext_2 <>", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThan(String value) { + addCriterion("ext_2 >", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThanOrEqualTo(String value) { + addCriterion("ext_2 >=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThan(String value) { + addCriterion("ext_2 <", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThanOrEqualTo(String value) { + addCriterion("ext_2 <=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Like(String value) { + addCriterion("ext_2 like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotLike(String value) { + addCriterion("ext_2 not like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2In(List values) { + addCriterion("ext_2 in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotIn(List values) { + addCriterion("ext_2 not in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Between(String value1, String value2) { + addCriterion("ext_2 between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotBetween(String value1, String value2) { + addCriterion("ext_2 not between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt3IsNull() { + addCriterion("ext_3 is null"); + return (Criteria) this; + } + + public Criteria andExt3IsNotNull() { + addCriterion("ext_3 is not null"); + return (Criteria) this; + } + + public Criteria andExt3EqualTo(String value) { + addCriterion("ext_3 =", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotEqualTo(String value) { + addCriterion("ext_3 <>", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThan(String value) { + addCriterion("ext_3 >", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThanOrEqualTo(String value) { + addCriterion("ext_3 >=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThan(String value) { + addCriterion("ext_3 <", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThanOrEqualTo(String value) { + addCriterion("ext_3 <=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Like(String value) { + addCriterion("ext_3 like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotLike(String value) { + addCriterion("ext_3 not like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3In(List values) { + addCriterion("ext_3 in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotIn(List values) { + addCriterion("ext_3 not in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Between(String value1, String value2) { + addCriterion("ext_3 between", value1, value2, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotBetween(String value1, String value2) { + addCriterion("ext_3 not between", value1, value2, "ext3"); + return (Criteria) this; + } + } + + /** + */ + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file 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 63b86f22..f9ab0be4 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 @@ -117,6 +117,9 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService { @Resource private ApiBlxCouponService apiBlxCouponService; + @Resource + private HighOrderService highOrderService; + @Override public HighOrder orderPaySuccessHandle(String orderNo, OrderPayType payType, String paySerialNo, BigDecimal payRealPrice, HighUserCard userCard) { @@ -326,6 +329,7 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService { // 扣预存款 this.redisTemplate.boundListOps(MsgTopic.MerStoreAccount.getName()).leftPush(pushParam); } + highOrderService.printGasOrder(order.getHighChildOrderList().get(0).getGoodsId(), gasOrder, false); } else if (gasOrder.getChannelType().equals(MerchantStoreSourceType.type2.getNumber())) { // 推送团油订单 diff --git a/hai-service/src/main/java/com/hai/service/HighOrderService.java b/hai-service/src/main/java/com/hai/service/HighOrderService.java index 710db95b..46500e5c 100644 --- a/hai-service/src/main/java/com/hai/service/HighOrderService.java +++ b/hai-service/src/main/java/com/hai/service/HighOrderService.java @@ -1,10 +1,7 @@ package com.hai.service; import com.alibaba.fastjson.JSONObject; -import com.hai.entity.HighChildOrder; -import com.hai.entity.HighOrder; -import com.hai.entity.HighUserCard; -import com.hai.entity.OutRechargeOrder; +import com.hai.entity.*; import com.hai.model.*; import io.swagger.models.auth.In; import org.apache.ibatis.annotations.Param; @@ -479,7 +476,7 @@ public interface HighOrderService { * 打印加油订单 * @param gasId */ - void printGasOrder(Long gasId, HighOrder order, boolean makeUp); + void printGasOrder(Long gasId, HighGasOrder order, boolean makeUp); /** * @Author Sum1Dream diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java index e04d83bd..1c63a18d 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java @@ -1368,71 +1368,93 @@ public class HighOrderServiceImpl implements HighOrderService { } @Override - public void printGasOrder(Long gasId, HighOrder order, boolean makeUp) { + public void printGasOrder(Long gasId, HighGasOrder order, boolean makeUp) { if (order == null) { return; } + // 查询油站云打印设备 + List deviceList = deviceService.getDeviceListByStoreId(gasId); + for (HighDevice device : deviceList) { + Map receiptMap = new HashMap<>(); + receiptMap.put("receiptTop", device.getReceiptTop()); + receiptMap.put("receiptSource", device.getReceiptSource()); + receiptMap.put("receiptBottom", device.getReceiptBottom()); + + if (device.getType().equals(DeviceTypeEnum.type1.getType())) { + new Thread(() -> { + try { + SpPrinterConfig sp = new SpPrinterConfig(); + sp.print(device.getDeviceSn(), + SpPrinterTemplate.oilCashierStubTemp( + order.getStoreName(), + order.getOrderNo(), + DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"), + order.getMemPhone(), + order.getGasGunNo(), + order.getGasOilNo(), + order.getGasOilLiters().toString(), + order.getGasRefuelPrice().toString(), + receiptMap, + makeUp + ), 1); + + sp.print(device.getDeviceSn(), + SpPrinterTemplate.oilClientStubTemp( + order.getStoreName(), + order.getOrderNo(), + DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"), + order.getMemPhone(), + order.getGasGunNo(), + order.getGasOilNo(), + order.getGasOilLiters().toString(), + order.getGasRefuelPrice().toString(), + receiptMap, + makeUp + ), 1); + + } catch (Exception e) { + e.printStackTrace(); + } + }).start(); + } - /* for (HighChildOrder childOrder : order.getHighChildOrderList()) { - if (childOrder.getGoodsType().equals(3)) { - - // 查询油站云打印设备 - List deviceList = deviceService.getDeviceListByStoreId(gasId); - for (HighDevice device : deviceList) { - Map receiptMap = new HashMap<>(); - receiptMap.put("receiptTop", device.getReceiptTop()); - receiptMap.put("receiptSource", device.getReceiptSource()); - receiptMap.put("receiptBottom", device.getReceiptBottom()); - - if (device.getType().equals(DeviceTypeEnum.type1.getType())) { - new Thread(() -> { - try { - SpPrinterConfig sp = new SpPrinterConfig(); - - String printStr = SpPrinterTemplate.oilCashierStubTemp( - childOrder.getGoodsName(), + if (device.getType().equals(DeviceTypeEnum.type2.getType())) { + new Thread(() -> { + try { + mqttProviderConfig.publish(2, false, device.getDeviceImei(), + ZkcPrinterTemplate.oilCashierStubTemp( + order.getStoreName(), order.getOrderNo(), DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"), order.getMemPhone(), - childOrder.getGasGunNo(), - childOrder.getGasOilNo(), - childOrder.getGasOilLiters().toString(), - order.getTotalPrice().toString(), + "嗨森逛", + order.getGasGunNo(), + order.getGasOilNo(), + order.getGasOilLiters().toString(), + order.getGasRefuelPrice().toString(), receiptMap, makeUp - ); - sp.print(device.getDeviceSn(), printStr, 1); - } catch (Exception e) { - e.printStackTrace(); - } - }).start(); - } - - if (device.getType().equals(DeviceTypeEnum.type2.getType())) { - new Thread(() -> { - try { - mqttProviderConfig.publish(2, false, device.getDeviceImei(), - ZkcPrinterTemplate.oilCashierStubTemp( - childOrder.getGoodsName(), + )); + mqttProviderConfig.publish(2, false, device.getDeviceImei(), + ZkcPrinterTemplate.oilClientStubTemp( + order.getStoreName(), order.getOrderNo(), DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"), order.getMemPhone(), "嗨森逛", - childOrder.getGasGunNo(), - childOrder.getGasOilNo(), - childOrder.getGasOilLiters().toString(), - order.getTotalPrice().toString(), + order.getGasGunNo(), + order.getGasOilNo(), + order.getGasOilLiters().toString(), + order.getGasRefuelPrice().toString(), receiptMap, makeUp )); - } catch (Exception e) { - e.getMessage(); - } - }).start(); + } catch (Exception e) { + e.getMessage(); } - } + }).start(); } - }*/ + } } public String priceName(Integer num) { diff --git a/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java index cbcd530d..642f1347 100644 --- a/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java @@ -509,7 +509,7 @@ public class GoodsOrderServiceImpl implements PayService { }).start(); } } - highOrderService.printGasOrder(order.getHighChildOrderList().get(0).getGoodsId(), order, false); + // highOrderService.printGasOrder(order.getHighChildOrderList().get(0).getGoodsId(), order, false); } catch (Exception e) { }