diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java b/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java index 51082332..fa15801c 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java @@ -1 +1 @@ -package com.cweb.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.cweb.config.SysConst; import com.hai.common.Base64Util; import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; import com.hai.common.pay.util.XmlUtil; import com.hai.common.pay.util.sdk.WXPayConstants; import com.hai.common.security.SessionObject; import com.hai.common.security.UserCenter; import com.hai.common.utils.*; import com.hai.config.*; import com.hai.dao.HighGasOrderPushMapper; import com.hai.entity.*; import com.hai.enum_type.MerchantStoreSourceType; import com.hai.model.*; import com.hai.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpEntity; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.ssl.SSLContexts; import org.apache.http.util.EntityUtils; import org.bouncycastle.util.encoders.UrlBase64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.util.IdGenerator; import org.springframework.web.bind.annotation.*; import sun.nio.cs.StreamEncoder; import javax.annotation.Resource; import javax.net.ssl.SSLContext; import javax.servlet.http.HttpServletRequest; import java.io.*; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.security.KeyStore; import java.util.*; /** * @Auther: 胡锐 * @Description: * @Date: 2021/3/26 23:08 */ @Controller @RequestMapping(value = "/test") @Api(value = "订单接口") public class HighTestController { private static Logger log = LoggerFactory.getLogger(HighTestController.class); @Resource private PayloService payloService; @Resource private HighGasService gasService; @RequestMapping(value = "/ycShellPageQueryAllStation", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "订单退款") public ResponseData ycShellPageQueryAllStation() { try { return ResponseMsgUtil.success(payloService.ycShellPageQueryAllStation(1, 50)); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getPayloAllStation", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "paylo油站") public ResponseData getPayloAllStation(HttpServletRequest request) { try { gasService.getPayloAllStation(); return ResponseMsgUtil.success(""); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } } \ No newline at end of file +package com.cweb.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.cweb.config.SysConst; import com.hai.common.Base64Util; import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; import com.hai.common.pay.util.XmlUtil; import com.hai.common.pay.util.sdk.WXPayConstants; import com.hai.common.security.SessionObject; import com.hai.common.security.UserCenter; import com.hai.common.utils.*; import com.hai.config.*; import com.hai.dao.HighGasOrderPushMapper; import com.hai.entity.*; import com.hai.enum_type.MerchantStoreSourceType; import com.hai.model.*; import com.hai.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpEntity; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.ssl.SSLContexts; import org.apache.http.util.EntityUtils; import org.bouncycastle.util.encoders.UrlBase64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.util.IdGenerator; import org.springframework.web.bind.annotation.*; import sun.nio.cs.StreamEncoder; import javax.annotation.Resource; import javax.net.ssl.SSLContext; import javax.servlet.http.HttpServletRequest; import java.io.*; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.security.KeyStore; import java.util.*; /** * @Auther: 胡锐 * @Description: * @Date: 2021/3/26 23:08 */ @Controller @RequestMapping(value = "/test") @Api(value = "订单接口") public class HighTestController { private static Logger log = LoggerFactory.getLogger(HighTestController.class); @Resource private PayloService payloService; @Resource private HighGasService gasService; @RequestMapping(value = "/ycShellPageQueryAllStation", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "订单退款") public ResponseData ycShellPageQueryAllStation() { try { return ResponseMsgUtil.success(payloService.ycShellPageQueryAllStation(1, 50)); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/HuiLianTongConfigPayOrderByCouNo", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "") public ResponseData HuiLianTongConfigPayOrderByCouNo(@RequestParam(name = "couNo", required = true) String couNo) { try { JSONObject jsonObject = HuiLianTongConfig.getPayOrderByCouNo(couNo); if (jsonObject.getString("respCode").equals("0000")) { JSONObject data = HuiLianTongUnionCardConfig.resolveResponse(jsonObject.getString("data")); return ResponseMsgUtil.success(data); } else { log.error("getRechargeProduct error!", "查询失败！"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR , "查询失败"); } } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getPayloAllStation", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "paylo油站") public ResponseData getPayloAllStation(HttpServletRequest request) { try { gasService.getPayloAllStation(); return ResponseMsgUtil.success(""); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } } \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/ApiIpAddressMapper.java b/hai-service/src/main/java/com/hai/dao/ApiIpAddressMapper.java deleted file mode 100644 index 65e45a13..00000000 --- a/hai-service/src/main/java/com/hai/dao/ApiIpAddressMapper.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.hai.dao; - -import com.hai.entity.ApiIpAddress; -import com.hai.entity.ApiIpAddressExample; -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 ApiIpAddressMapper extends ApiIpAddressMapperExt { - @SelectProvider(type=ApiIpAddressSqlProvider.class, method="countByExample") - long countByExample(ApiIpAddressExample example); - - @DeleteProvider(type=ApiIpAddressSqlProvider.class, method="deleteByExample") - int deleteByExample(ApiIpAddressExample example); - - @Delete({ - "delete from api_ip_address", - "where id = #{id,jdbcType=BIGINT}" - }) - int deleteByPrimaryKey(Long id); - - @Insert({ - "insert into api_ip_address (ip_address, mch_id, ", - "create_time, update_time, ", - "ext_1, ext_2, ext_3)", - "values (#{ipAddress,jdbcType=VARCHAR}, #{mchId,jdbcType=VARCHAR}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" - }) - @Options(useGeneratedKeys=true,keyProperty="id") - int insert(ApiIpAddress record); - - @InsertProvider(type=ApiIpAddressSqlProvider.class, method="insertSelective") - @Options(useGeneratedKeys=true,keyProperty="id") - int insertSelective(ApiIpAddress record); - - @SelectProvider(type=ApiIpAddressSqlProvider.class, method="selectByExample") - @Results({ - @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="ip_address", property="ipAddress", jdbcType=JdbcType.VARCHAR), - @Result(column="mch_id", property="mchId", 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(ApiIpAddressExample example); - - @Select({ - "select", - "id, ip_address, mch_id, create_time, update_time, ext_1, ext_2, ext_3", - "from api_ip_address", - "where id = #{id,jdbcType=BIGINT}" - }) - @Results({ - @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="ip_address", property="ipAddress", jdbcType=JdbcType.VARCHAR), - @Result(column="mch_id", property="mchId", 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) - }) - ApiIpAddress selectByPrimaryKey(Long id); - - @UpdateProvider(type=ApiIpAddressSqlProvider.class, method="updateByExampleSelective") - int updateByExampleSelective(@Param("record") ApiIpAddress record, @Param("example") ApiIpAddressExample example); - - @UpdateProvider(type=ApiIpAddressSqlProvider.class, method="updateByExample") - int updateByExample(@Param("record") ApiIpAddress record, @Param("example") ApiIpAddressExample example); - - @UpdateProvider(type=ApiIpAddressSqlProvider.class, method="updateByPrimaryKeySelective") - int updateByPrimaryKeySelective(ApiIpAddress record); - - @Update({ - "update api_ip_address", - "set ip_address = #{ipAddress,jdbcType=VARCHAR},", - "mch_id = #{mchId,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(ApiIpAddress record); -} diff --git a/hai-service/src/main/java/com/hai/dao/ApiIpAddressMapperExt.java b/hai-service/src/main/java/com/hai/dao/ApiIpAddressMapperExt.java deleted file mode 100644 index 28cd66fb..00000000 --- a/hai-service/src/main/java/com/hai/dao/ApiIpAddressMapperExt.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.hai.dao; - -public interface ApiIpAddressMapperExt { -} diff --git a/hai-service/src/main/java/com/hai/dao/ApiIpAddressSqlProvider.java b/hai-service/src/main/java/com/hai/dao/ApiIpAddressSqlProvider.java deleted file mode 100644 index 98dc4265..00000000 --- a/hai-service/src/main/java/com/hai/dao/ApiIpAddressSqlProvider.java +++ /dev/null @@ -1,276 +0,0 @@ -package com.hai.dao; - -import com.hai.entity.ApiIpAddress; -import com.hai.entity.ApiIpAddressExample.Criteria; -import com.hai.entity.ApiIpAddressExample.Criterion; -import com.hai.entity.ApiIpAddressExample; -import java.util.List; -import java.util.Map; -import org.apache.ibatis.jdbc.SQL; - -public class ApiIpAddressSqlProvider { - - public String countByExample(ApiIpAddressExample example) { - SQL sql = new SQL(); - sql.SELECT("count(*)").FROM("api_ip_address"); - applyWhere(sql, example, false); - return sql.toString(); - } - - public String deleteByExample(ApiIpAddressExample example) { - SQL sql = new SQL(); - sql.DELETE_FROM("api_ip_address"); - applyWhere(sql, example, false); - return sql.toString(); - } - - public String insertSelective(ApiIpAddress record) { - SQL sql = new SQL(); - sql.INSERT_INTO("api_ip_address"); - - if (record.getIpAddress() != null) { - sql.VALUES("ip_address", "#{ipAddress,jdbcType=VARCHAR}"); - } - - if (record.getMchId() != null) { - sql.VALUES("mch_id", "#{mchId,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(ApiIpAddressExample example) { - SQL sql = new SQL(); - if (example != null && example.isDistinct()) { - sql.SELECT_DISTINCT("id"); - } else { - sql.SELECT("id"); - } - sql.SELECT("ip_address"); - sql.SELECT("mch_id"); - sql.SELECT("create_time"); - sql.SELECT("update_time"); - sql.SELECT("ext_1"); - sql.SELECT("ext_2"); - sql.SELECT("ext_3"); - sql.FROM("api_ip_address"); - applyWhere(sql, example, false); - - if (example != null && example.getOrderByClause() != null) { - sql.ORDER_BY(example.getOrderByClause()); - } - - return sql.toString(); - } - - public String updateByExampleSelective(Map parameter) { - ApiIpAddress record = (ApiIpAddress) parameter.get("record"); - ApiIpAddressExample example = (ApiIpAddressExample) parameter.get("example"); - - SQL sql = new SQL(); - sql.UPDATE("api_ip_address"); - - if (record.getId() != null) { - sql.SET("id = #{record.id,jdbcType=BIGINT}"); - } - - if (record.getIpAddress() != null) { - sql.SET("ip_address = #{record.ipAddress,jdbcType=VARCHAR}"); - } - - if (record.getMchId() != null) { - sql.SET("mch_id = #{record.mchId,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("api_ip_address"); - - sql.SET("id = #{record.id,jdbcType=BIGINT}"); - sql.SET("ip_address = #{record.ipAddress,jdbcType=VARCHAR}"); - sql.SET("mch_id = #{record.mchId,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}"); - - ApiIpAddressExample example = (ApiIpAddressExample) parameter.get("example"); - applyWhere(sql, example, true); - return sql.toString(); - } - - public String updateByPrimaryKeySelective(ApiIpAddress record) { - SQL sql = new SQL(); - sql.UPDATE("api_ip_address"); - - if (record.getIpAddress() != null) { - sql.SET("ip_address = #{ipAddress,jdbcType=VARCHAR}"); - } - - if (record.getMchId() != null) { - sql.SET("mch_id = #{mchId,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, ApiIpAddressExample 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()); - } - } -} diff --git a/hai-service/src/main/java/com/hai/entity/ApiIpAddress.java b/hai-service/src/main/java/com/hai/entity/ApiIpAddress.java deleted file mode 100644 index bd733129..00000000 --- a/hai-service/src/main/java/com/hai/entity/ApiIpAddress.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.hai.entity; - -import java.io.Serializable; -import java.util.Date; - -/** - * api_ip_address - * @author - */ -/** - * - * 代码由工具生成 - * - **/ -public class ApiIpAddress implements Serializable { - /** - * 主键 - */ - private Long id; - - /** - * ip地址 - */ - private String ipAddress; - - /** - * 商户号 - */ - private String mchId; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新时间 - */ - private Date updateTime; - - /** - * ext_1 - */ - private String ext1; - - /** - * ext_2 - */ - private String ext2; - - /** - * ext_3 - */ - private String ext3; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getIpAddress() { - return ipAddress; - } - - public void setIpAddress(String ipAddress) { - this.ipAddress = ipAddress; - } - - public String getMchId() { - return mchId; - } - - public void setMchId(String mchId) { - this.mchId = mchId; - } - - 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; - } - ApiIpAddress other = (ApiIpAddress) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getIpAddress() == null ? other.getIpAddress() == null : this.getIpAddress().equals(other.getIpAddress())) - && (this.getMchId() == null ? other.getMchId() == null : this.getMchId().equals(other.getMchId())) - && (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 + ((getIpAddress() == null) ? 0 : getIpAddress().hashCode()); - result = prime * result + ((getMchId() == null) ? 0 : getMchId().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(", ipAddress=").append(ipAddress); - sb.append(", mchId=").append(mchId); - 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(); - } -} diff --git a/hai-service/src/main/java/com/hai/entity/ApiIpAddressExample.java b/hai-service/src/main/java/com/hai/entity/ApiIpAddressExample.java deleted file mode 100644 index 6e9a2b4d..00000000 --- a/hai-service/src/main/java/com/hai/entity/ApiIpAddressExample.java +++ /dev/null @@ -1,753 +0,0 @@ -package com.hai.entity; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class ApiIpAddressExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Long offset; - - public ApiIpAddressExample() { - 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 andIpAddressIsNull() { - addCriterion("ip_address is null"); - return (Criteria) this; - } - - public Criteria andIpAddressIsNotNull() { - addCriterion("ip_address is not null"); - return (Criteria) this; - } - - public Criteria andIpAddressEqualTo(String value) { - addCriterion("ip_address =", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressNotEqualTo(String value) { - addCriterion("ip_address <>", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressGreaterThan(String value) { - addCriterion("ip_address >", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressGreaterThanOrEqualTo(String value) { - addCriterion("ip_address >=", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressLessThan(String value) { - addCriterion("ip_address <", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressLessThanOrEqualTo(String value) { - addCriterion("ip_address <=", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressLike(String value) { - addCriterion("ip_address like", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressNotLike(String value) { - addCriterion("ip_address not like", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressIn(List values) { - addCriterion("ip_address in", values, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressNotIn(List values) { - addCriterion("ip_address not in", values, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressBetween(String value1, String value2) { - addCriterion("ip_address between", value1, value2, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressNotBetween(String value1, String value2) { - addCriterion("ip_address not between", value1, value2, "ipAddress"); - return (Criteria) this; - } - - public Criteria andMchIdIsNull() { - addCriterion("mch_id is null"); - return (Criteria) this; - } - - public Criteria andMchIdIsNotNull() { - addCriterion("mch_id is not null"); - return (Criteria) this; - } - - public Criteria andMchIdEqualTo(String value) { - addCriterion("mch_id =", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdNotEqualTo(String value) { - addCriterion("mch_id <>", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdGreaterThan(String value) { - addCriterion("mch_id >", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdGreaterThanOrEqualTo(String value) { - addCriterion("mch_id >=", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdLessThan(String value) { - addCriterion("mch_id <", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdLessThanOrEqualTo(String value) { - addCriterion("mch_id <=", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdLike(String value) { - addCriterion("mch_id like", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdNotLike(String value) { - addCriterion("mch_id not like", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdIn(List values) { - addCriterion("mch_id in", values, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdNotIn(List values) { - addCriterion("mch_id not in", values, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdBetween(String value1, String value2) { - addCriterion("mch_id between", value1, value2, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdNotBetween(String value1, String value2) { - addCriterion("mch_id not between", value1, value2, "mchId"); - 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); - } - } -} diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java index ceb2f7a2..c0bc336f 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java @@ -123,6 +123,9 @@ public class OrderServiceImpl implements OrderService { if (discountUserRel == null || discountUserRel.getStatus() != 1) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "优惠券不可用"); } + if (new Date().compareTo(discountUserRel.getUseEndTime()) >= 1) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "优惠券不可用"); + } discountUserRel.setUseTime(new Date()); // 使用时间 discountUserRel.setStatus(2); //状态 0:已过期 1：未使用 2：已使用 discountUserRelService.updateDiscountUserRel(discountUserRel); diff --git a/hai-service/src/main/java/com/hai/service/impl/HighDiscountUserRelServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighDiscountUserRelServiceImpl.java index 0fa3492d..2f02ed4c 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighDiscountUserRelServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighDiscountUserRelServiceImpl.java @@ -76,6 +76,9 @@ public class HighDiscountUserRelServiceImpl implements HighDiscountUserRelServic if (!discount.getStatus().equals(2)) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法领取，优惠券活动已过期"); } + if (new Date().compareTo(discount.getSalesEndTime()) >= 1) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法领取，优惠券活动已过期"); + } if (discount.getReceiveNumber() > 0 && this.receiveDiscountCount(userId, discount.getId()).intValue() >= discount.getReceiveNumber().intValue()) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "优惠券已达到上线"); } @@ -128,6 +131,13 @@ public class HighDiscountUserRelServiceImpl implements HighDiscountUserRelServic } + public static void main(String[] args) { + System.out.println(new Date().compareTo(new Date(1677600000000L))); + if (new Date().compareTo(new Date(1678464000000L)) >= 1) { + System.out.println(true); + } + } + @Override @Transactional(propagation= Propagation.REQUIRES_NEW,isolation= Isolation.SERIALIZABLE) public void receive(Long userId, Long discountAgentId) { @@ -144,6 +154,9 @@ public class HighDiscountUserRelServiceImpl implements HighDiscountUserRelServic if (!discount.getStatus().equals(2)) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法领取，优惠券活动已过期"); } + if (new Date().compareTo(discount.getSalesEndTime()) >= 1) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法领取，优惠券活动已过期"); + } if (discount.getReceiveNumber() > 0 && this.receiveDiscountCount(userId, discount.getId()) >= discount.getReceiveNumber()) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "领取数量已达到上线"); }