diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighGasDiscountOilPriceController.java b/hai-bweb/src/main/java/com/bweb/controller/HighGasDiscountOilPriceController.java new file mode 100644 index 00000000..0e08c057 --- /dev/null +++ b/hai-bweb/src/main/java/com/bweb/controller/HighGasDiscountOilPriceController.java @@ -0,0 +1,152 @@ +package com.bweb.controller; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hai.common.exception.ErrorCode; +import com.hai.common.exception.ErrorHelp; +import com.hai.common.exception.SysCode; +import com.hai.common.utils.CoordCommonUtil; +import com.hai.common.utils.PageUtil; +import com.hai.common.utils.ResponseMsgUtil; +import com.hai.entity.HighGasDiscountOilPrice; +import com.hai.model.ResponseData; +import com.hai.service.CommonService; +import com.hai.service.HighGasDiscountOilPriceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; + +@Controller +@RequestMapping(value = "/highGasDiscountOilPrice") +@Api(value = "油品价格配置") +public class HighGasDiscountOilPriceController { + + private static Logger log = LoggerFactory.getLogger(HighGasDiscountOilPriceController.class); + + @Resource + private HighGasDiscountOilPriceService highGasDiscountOilPriceService; + + @Resource + private CommonService commonService; + + @RequestMapping(value="/editGasDiscountOilPrice",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "编辑油品价格") + public ResponseData editGasDiscountOilPrice(@RequestBody JSONObject body) { + try { + if (StringUtils.isBlank(body.getString("oilNoName")) || body.getBigDecimal("priceRate") == null) { + log.error("HighGasDiscountOilPriceController -> editGasDiscountOilPrice() error!",""); + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + if (StringUtils.isBlank(commonService.getDictionaryCodeName("GAS_OIL_TYPE", body.getString("oilNoName")))) { + log.error("HighGasDiscountOilPriceController -> editGasDiscountOilPrice() error!",""); + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未在系统中找到此油品"); + } + + HighGasDiscountOilPrice detail; + detail = highGasDiscountOilPriceService.getDetailByOilNoName(body.getString("oilNoName")); + if (detail == null) { + detail = new HighGasDiscountOilPrice(); + detail.setOilNoName(body.getString("oilNoName")); + detail.setPriceRate(body.getBigDecimal("priceRate")); + detail.setCreateTime(new Date()); + detail.setUpdateTime(new Date()); + } else { + detail.setPriceRate(body.getBigDecimal("priceRate")); + detail.setUpdateTime(new Date()); + } + highGasDiscountOilPriceService.editGasDiscountOilPrice(detail); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("HighGasDiscountOilPriceController -> getGasDetailByStoreKey() error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/delete",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "删除") + public ResponseData delete(@RequestBody JSONObject body) { + try { + if (body.getLong("id") == null) { + log.error("HighGasDiscountOilPriceController -> delete() error!",""); + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + if (highGasDiscountOilPriceService.getDetail(body.getLong("id")) == null) { + log.error("HighGasDiscountOilPriceController -> delete() error!",""); + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到数据"); + } + + // 删除 + highGasDiscountOilPriceService.delete(body.getLong("id")); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("HighGasDiscountOilPriceController -> delete() error!",e); + return ResponseMsgUtil.exception(e); + } + } + + + @RequestMapping(value="/getDetailById",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "根据id查询") + public ResponseData getDetailById(@RequestParam(name = "id", required = true) Long id) { + try { + + return ResponseMsgUtil.success(highGasDiscountOilPriceService.getDetail(id)); + + } catch (Exception e) { + log.error("HighGasDiscountOilPriceController -> getDetailById() error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/getDetailByOilNoName",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "根据油品查询") + public ResponseData getDetailByOilNoName(@RequestParam(name = "oilNoName", required = true) String oilNoName) { + try { + + return ResponseMsgUtil.success(highGasDiscountOilPriceService.getDetailByOilNoName(oilNoName)); + + } catch (Exception e) { + log.error("HighGasDiscountOilPriceController -> getDetailByOilNoName() error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/getList",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询列表") + public ResponseData getList(@RequestParam(name = "oilNoName", required = false) String oilNoName, + @RequestParam(name = "pageNum", required = true) Integer pageNum, + @RequestParam(name = "pageSize", required = true) Integer pageSize) { + try { + + Map map = new HashMap<>(); + map.put("oilNoName", oilNoName); + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(highGasDiscountOilPriceService.getList(map))); + + } catch (Exception e) { + log.error("HighGasDiscountOilPriceController -> getDetailByOilNoName() error!",e); + return ResponseMsgUtil.exception(e); + } + } +} diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java index c4babf63..1fe6dc2d 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java @@ -262,8 +262,8 @@ public class OrderController { //微信支付 String nonce_str = MD5Util.MD5Encode(String.valueOf(ThreadLocalRandom.current().nextInt(10000)), "UTF-8"); - int total_fee = MathUtils.objectConvertBigDecimal(map.get("payPrice")).multiply(new BigDecimal("100")).intValue(); - // int total_fee = 1; + // int total_fee = MathUtils.objectConvertBigDecimal(map.get("payPrice")).multiply(new BigDecimal("100")).intValue(); + int total_fee = 1; WeChatPayReqInfo weChatPayReqInfo = new WeChatPayReqInfo(); weChatPayReqInfo.setAppid(SysConst.getSysConfig().getWxMchAppId()); //公众号id weChatPayReqInfo.setMch_id(SysConst.getSysConfig().getWxMchId()); //商户号 diff --git a/hai-cweb/src/main/java/com/cweb/controller/tPigController.java b/hai-cweb/src/main/java/com/cweb/controller/tPigController.java index d93ff84f..b9ca5242 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/tPigController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/tPigController.java @@ -45,9 +45,8 @@ public class tPigController { String url = ""; if (token.getBoolean("success")) { JSONObject data = token.getJSONObject("data"); - url = "https://qz.dctpay.com/kfc/?platformId=" + CommonSysConst.getSysConfig().getQinzhuPlatformId() + "&token=" + data.getString("accessToken"); + url = CommonSysConst.getSysConfig().getQinzhuHtmlUrl()+"/kfc/?platformId="+CommonSysConst.getSysConfig().getQinzhuPlatformId()+"&token=" + data.getString("accessToken"); } - return ResponseMsgUtil.success(url); } catch (Exception e) { return ResponseMsgUtil.exception(e); @@ -65,9 +64,8 @@ public class tPigController { String url = ""; if (token.getBoolean("success")) { JSONObject data = token.getJSONObject("data"); - url = "https://qz.dctpay.com/cinema/?platformId="+CommonSysConst.getSysConfig().getQinzhuPlatformId()+"&token="+data.getString("accessToken"); + url = CommonSysConst.getSysConfig().getQinzhuHtmlUrl()+"/cinema/?platformId="+CommonSysConst.getSysConfig().getQinzhuPlatformId()+"&token="+data.getString("accessToken"); } - return ResponseMsgUtil.success(url); } catch (Exception e) { return ResponseMsgUtil.exception(e); @@ -85,7 +83,7 @@ public class tPigController { String url = ""; if (token.getBoolean("success")) { JSONObject data = token.getJSONObject("data"); - url = "https://qz.dctpay.com/mobile/?platformId="+CommonSysConst.getSysConfig().getQinzhuPlatformId()+"&token=" + data.getString("accessToken"); + url = CommonSysConst.getSysConfig().getQinzhuHtmlUrl()+"/mobile/?platformId="+CommonSysConst.getSysConfig().getQinzhuPlatformId()+"&token=" + data.getString("accessToken"); } return ResponseMsgUtil.success(url); } catch (Exception e) { diff --git a/hai-service/src/main/java/com/hai/config/CommonSysConfig.java b/hai-service/src/main/java/com/hai/config/CommonSysConfig.java index eea0a640..b94cb53e 100644 --- a/hai-service/src/main/java/com/hai/config/CommonSysConfig.java +++ b/hai-service/src/main/java/com/hai/config/CommonSysConfig.java @@ -16,6 +16,7 @@ public class CommonSysConfig { private String tuanYouGasolineAccount; // 汽油账号 private String qinzhuUrl; + private String qinzhuHtmlUrl; private String qinzhuMobileUrl; // 话费充值地址 private String qinzhuPlatformId; private String qinzhuSecret; @@ -29,6 +30,14 @@ public class CommonSysConfig { private String telUrl; private String czOrderNotify; + public String getQinzhuHtmlUrl() { + return qinzhuHtmlUrl; + } + + public void setQinzhuHtmlUrl(String qinzhuHtmlUrl) { + this.qinzhuHtmlUrl = qinzhuHtmlUrl; + } + public String getCzOrderNotify() { return czOrderNotify; } diff --git a/hai-service/src/main/java/com/hai/dao/HighGasDiscountOilPriceMapper.java b/hai-service/src/main/java/com/hai/dao/HighGasDiscountOilPriceMapper.java new file mode 100644 index 00000000..012381db --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasDiscountOilPriceMapper.java @@ -0,0 +1,108 @@ +package com.hai.dao; + +import com.hai.entity.HighGasDiscountOilPrice; +import com.hai.entity.HighGasDiscountOilPriceExample; +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 HighGasDiscountOilPriceMapper extends HighGasDiscountOilPriceMapperExt { + @SelectProvider(type=HighGasDiscountOilPriceSqlProvider.class, method="countByExample") + long countByExample(HighGasDiscountOilPriceExample example); + + @DeleteProvider(type=HighGasDiscountOilPriceSqlProvider.class, method="deleteByExample") + int deleteByExample(HighGasDiscountOilPriceExample example); + + @Delete({ + "delete from high_gas_discount_oil_price", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into high_gas_discount_oil_price (oil_no_name, price_rate, ", + "create_time, update_time, ", + "ext_1, ext_2, ext_3)", + "values (#{oilNoName,jdbcType=VARCHAR}, #{priceRate,jdbcType=DECIMAL}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(HighGasDiscountOilPrice record); + + @InsertProvider(type=HighGasDiscountOilPriceSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(HighGasDiscountOilPrice record); + + @SelectProvider(type=HighGasDiscountOilPriceSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="oil_no_name", property="oilNoName", jdbcType=JdbcType.VARCHAR), + @Result(column="price_rate", property="priceRate", jdbcType=JdbcType.DECIMAL), + @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(HighGasDiscountOilPriceExample example); + + @Select({ + "select", + "id, oil_no_name, price_rate, create_time, update_time, ext_1, ext_2, ext_3", + "from high_gas_discount_oil_price", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="oil_no_name", property="oilNoName", jdbcType=JdbcType.VARCHAR), + @Result(column="price_rate", property="priceRate", jdbcType=JdbcType.DECIMAL), + @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) + }) + HighGasDiscountOilPrice selectByPrimaryKey(Long id); + + @UpdateProvider(type=HighGasDiscountOilPriceSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") HighGasDiscountOilPrice record, @Param("example") HighGasDiscountOilPriceExample example); + + @UpdateProvider(type=HighGasDiscountOilPriceSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") HighGasDiscountOilPrice record, @Param("example") HighGasDiscountOilPriceExample example); + + @UpdateProvider(type=HighGasDiscountOilPriceSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(HighGasDiscountOilPrice record); + + @Update({ + "update high_gas_discount_oil_price", + "set oil_no_name = #{oilNoName,jdbcType=VARCHAR},", + "price_rate = #{priceRate,jdbcType=DECIMAL},", + "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(HighGasDiscountOilPrice record); +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighGasDiscountOilPriceMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighGasDiscountOilPriceMapperExt.java new file mode 100644 index 00000000..3ebc9589 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasDiscountOilPriceMapperExt.java @@ -0,0 +1,7 @@ +package com.hai.dao; + +/** + * mapper扩展类 + */ +public interface HighGasDiscountOilPriceMapperExt { +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighGasDiscountOilPriceSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighGasDiscountOilPriceSqlProvider.java new file mode 100644 index 00000000..4927d709 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasDiscountOilPriceSqlProvider.java @@ -0,0 +1,276 @@ +package com.hai.dao; + +import com.hai.entity.HighGasDiscountOilPrice; +import com.hai.entity.HighGasDiscountOilPriceExample.Criteria; +import com.hai.entity.HighGasDiscountOilPriceExample.Criterion; +import com.hai.entity.HighGasDiscountOilPriceExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class HighGasDiscountOilPriceSqlProvider { + + public String countByExample(HighGasDiscountOilPriceExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("high_gas_discount_oil_price"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(HighGasDiscountOilPriceExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("high_gas_discount_oil_price"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(HighGasDiscountOilPrice record) { + SQL sql = new SQL(); + sql.INSERT_INTO("high_gas_discount_oil_price"); + + if (record.getOilNoName() != null) { + sql.VALUES("oil_no_name", "#{oilNoName,jdbcType=VARCHAR}"); + } + + if (record.getPriceRate() != null) { + sql.VALUES("price_rate", "#{priceRate,jdbcType=DECIMAL}"); + } + + 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(HighGasDiscountOilPriceExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("oil_no_name"); + sql.SELECT("price_rate"); + sql.SELECT("create_time"); + sql.SELECT("update_time"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.FROM("high_gas_discount_oil_price"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + HighGasDiscountOilPrice record = (HighGasDiscountOilPrice) parameter.get("record"); + HighGasDiscountOilPriceExample example = (HighGasDiscountOilPriceExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("high_gas_discount_oil_price"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getOilNoName() != null) { + sql.SET("oil_no_name = #{record.oilNoName,jdbcType=VARCHAR}"); + } + + if (record.getPriceRate() != null) { + sql.SET("price_rate = #{record.priceRate,jdbcType=DECIMAL}"); + } + + 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("high_gas_discount_oil_price"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("oil_no_name = #{record.oilNoName,jdbcType=VARCHAR}"); + sql.SET("price_rate = #{record.priceRate,jdbcType=DECIMAL}"); + 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}"); + + HighGasDiscountOilPriceExample example = (HighGasDiscountOilPriceExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(HighGasDiscountOilPrice record) { + SQL sql = new SQL(); + sql.UPDATE("high_gas_discount_oil_price"); + + if (record.getOilNoName() != null) { + sql.SET("oil_no_name = #{oilNoName,jdbcType=VARCHAR}"); + } + + if (record.getPriceRate() != null) { + sql.SET("price_rate = #{priceRate,jdbcType=DECIMAL}"); + } + + 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, HighGasDiscountOilPriceExample 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/HighGasDiscountOilPrice.java b/hai-service/src/main/java/com/hai/entity/HighGasDiscountOilPrice.java new file mode 100644 index 00000000..a312dc56 --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighGasDiscountOilPrice.java @@ -0,0 +1,166 @@ +package com.hai.entity; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * high_gas_discount_oil_price + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class HighGasDiscountOilPrice implements Serializable { + private Long id; + + /** + * 油品名称 + */ + private String oilNoName; + + /** + * 优惠比例 + */ + private BigDecimal priceRate; + + /** + * 创建时间 + */ + 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 String getOilNoName() { + return oilNoName; + } + + public void setOilNoName(String oilNoName) { + this.oilNoName = oilNoName; + } + + public BigDecimal getPriceRate() { + return priceRate; + } + + public void setPriceRate(BigDecimal priceRate) { + this.priceRate = priceRate; + } + + 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; + } + HighGasDiscountOilPrice other = (HighGasDiscountOilPrice) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getOilNoName() == null ? other.getOilNoName() == null : this.getOilNoName().equals(other.getOilNoName())) + && (this.getPriceRate() == null ? other.getPriceRate() == null : this.getPriceRate().equals(other.getPriceRate())) + && (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 + ((getOilNoName() == null) ? 0 : getOilNoName().hashCode()); + result = prime * result + ((getPriceRate() == null) ? 0 : getPriceRate().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(", oilNoName=").append(oilNoName); + sb.append(", priceRate=").append(priceRate); + 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/HighGasDiscountOilPriceExample.java b/hai-service/src/main/java/com/hai/entity/HighGasDiscountOilPriceExample.java new file mode 100644 index 00000000..8556e98b --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighGasDiscountOilPriceExample.java @@ -0,0 +1,744 @@ +package com.hai.entity; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class HighGasDiscountOilPriceExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public HighGasDiscountOilPriceExample() { + 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 andOilNoNameIsNull() { + addCriterion("oil_no_name is null"); + return (Criteria) this; + } + + public Criteria andOilNoNameIsNotNull() { + addCriterion("oil_no_name is not null"); + return (Criteria) this; + } + + public Criteria andOilNoNameEqualTo(String value) { + addCriterion("oil_no_name =", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameNotEqualTo(String value) { + addCriterion("oil_no_name <>", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameGreaterThan(String value) { + addCriterion("oil_no_name >", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameGreaterThanOrEqualTo(String value) { + addCriterion("oil_no_name >=", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameLessThan(String value) { + addCriterion("oil_no_name <", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameLessThanOrEqualTo(String value) { + addCriterion("oil_no_name <=", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameLike(String value) { + addCriterion("oil_no_name like", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameNotLike(String value) { + addCriterion("oil_no_name not like", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameIn(List values) { + addCriterion("oil_no_name in", values, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameNotIn(List values) { + addCriterion("oil_no_name not in", values, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameBetween(String value1, String value2) { + addCriterion("oil_no_name between", value1, value2, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameNotBetween(String value1, String value2) { + addCriterion("oil_no_name not between", value1, value2, "oilNoName"); + return (Criteria) this; + } + + public Criteria andPriceRateIsNull() { + addCriterion("price_rate is null"); + return (Criteria) this; + } + + public Criteria andPriceRateIsNotNull() { + addCriterion("price_rate is not null"); + return (Criteria) this; + } + + public Criteria andPriceRateEqualTo(BigDecimal value) { + addCriterion("price_rate =", value, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateNotEqualTo(BigDecimal value) { + addCriterion("price_rate <>", value, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateGreaterThan(BigDecimal value) { + addCriterion("price_rate >", value, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("price_rate >=", value, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateLessThan(BigDecimal value) { + addCriterion("price_rate <", value, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateLessThanOrEqualTo(BigDecimal value) { + addCriterion("price_rate <=", value, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateIn(List values) { + addCriterion("price_rate in", values, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateNotIn(List values) { + addCriterion("price_rate not in", values, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price_rate between", value1, value2, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price_rate not between", value1, value2, "priceRate"); + 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/service/HighGasDiscountOilPriceService.java b/hai-service/src/main/java/com/hai/service/HighGasDiscountOilPriceService.java new file mode 100644 index 00000000..0baaca7c --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/HighGasDiscountOilPriceService.java @@ -0,0 +1,43 @@ +package com.hai.service; + +import com.hai.entity.HighGasDiscountOilPrice; + +import java.util.List; +import java.util.Map; + +public interface HighGasDiscountOilPriceService { + + /** + * 编辑 + */ + void editGasDiscountOilPrice(HighGasDiscountOilPrice highGasDiscountOilPrice); + + /** + * 删除 + * @param id + */ + void delete(Long id); + + /** + * 根据id查询 + * @param id + * @return + */ + HighGasDiscountOilPrice getDetail(Long id); + + /** + * 根据油品名称 查询 + * @param oilNoName + * @return + */ + HighGasDiscountOilPrice getDetailByOilNoName(String oilNoName); + + /** + * 查询列表 + * @param map + * @return + */ + List getList(Map map); + + +} diff --git a/hai-service/src/main/java/com/hai/service/impl/HighGasDiscountOilPriceServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighGasDiscountOilPriceServiceImpl.java new file mode 100644 index 00000000..4df4237c --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/impl/HighGasDiscountOilPriceServiceImpl.java @@ -0,0 +1,62 @@ +package com.hai.service.impl; + +import com.hai.dao.HighGasDiscountOilPriceMapper; +import com.hai.entity.HighGasDiscountOilPrice; +import com.hai.entity.HighGasDiscountOilPriceExample; +import com.hai.service.HighGasDiscountOilPriceService; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +@Service("highGasDiscountOilPriceService") +public class HighGasDiscountOilPriceServiceImpl implements HighGasDiscountOilPriceService { + + @Resource + private HighGasDiscountOilPriceMapper highGasDiscountOilPriceMapper; + + @Override + public void editGasDiscountOilPrice(HighGasDiscountOilPrice highGasDiscountOilPrice) { + if (highGasDiscountOilPrice.getId() != null) { + highGasDiscountOilPriceMapper.updateByPrimaryKey(highGasDiscountOilPrice); + } else { + highGasDiscountOilPriceMapper.insert(highGasDiscountOilPrice); + } + } + + @Override + public void delete(Long id) { + highGasDiscountOilPriceMapper.deleteByPrimaryKey(id); + } + + @Override + public HighGasDiscountOilPrice getDetail(Long id) { + return highGasDiscountOilPriceMapper.selectByPrimaryKey(id); + } + + @Override + public HighGasDiscountOilPrice getDetailByOilNoName(String oilNoName) { + HighGasDiscountOilPriceExample example = new HighGasDiscountOilPriceExample(); + example.createCriteria().andOilNoNameEqualTo(oilNoName); + List list = highGasDiscountOilPriceMapper.selectByExample(example); + if (list.size() > 0) { + return list.get(0); + } + return null; + } + + @Override + public List getList(Map map) { + HighGasDiscountOilPriceExample example = new HighGasDiscountOilPriceExample(); + HighGasDiscountOilPriceExample.Criteria criteria = example.createCriteria(); + + if (StringUtils.isNotBlank(MapUtils.getString(map, "oilNoName"))) { + criteria.andOilNoNameEqualTo(MapUtils.getString(map, "oilNoName")); + } + example.setOrderByClause("create_time desc"); + return highGasDiscountOilPriceMapper.selectByExample(example); + } +} diff --git a/hai-service/src/main/resources/dev/commonConfig.properties b/hai-service/src/main/resources/dev/commonConfig.properties index 9a3f8ebe..318112d2 100644 --- a/hai-service/src/main/resources/dev/commonConfig.properties +++ b/hai-service/src/main/resources/dev/commonConfig.properties @@ -1,16 +1,17 @@ -tuanYouUrl=https://hcs.czb365.com -tuanYouAppKey=210091174083104 -tuanYouAppSecret=f9811df6791d309bf48f4a8db9edaa45 -tuanYouDieselAccount=9hp52qgg4400 -tuanYouGasolineAccount=9hp52qf04400 +tuanYouUrl=https://test02-motorcade-hcs.czb365.com +tuanYouAppKey=208241666939552 +tuanYouAppSecret=adecc3cff077834cb8632c8ab3bec0e6 +tuanYouDieselAccount=9b115eao4400 +tuanYouGasolineAccount=9b115e5g4400 -qinzhuUrl=https://live.qianzhu8.com/ -qinzhuPlatformId=10458 -qinzhuSecret=nnl3gg4ss0pka11t +qinzhuUrl=https://live-test.qianzhu8.com +qinzhuHtmlUrl=https://m-test.qianzhu8.com +qinzhuPlatformId=10376 +qinzhuSecret=ktxb49sh2jfhgn8g qianzhuOrderNotify=https://hsg.dctpay.com/crest/qianzhu/orderNotify wx_cert=/home/project/wx_cert/ TelApiKey=2d01f6b520254b1a80f6b167832cea18 TelApiSecret=d11ee9b41e014a039f030e53ae6f5295 -TelMemberId=d13091df65d64aafbf0f35d2093157b7 +TelMemberId=d13091df65d64aafbf0f35d2093157b7 \ No newline at end of file diff --git a/hai-service/src/main/resources/prod/commonConfig.properties b/hai-service/src/main/resources/prod/commonConfig.properties index 9a3f8ebe..2dd8a8c2 100644 --- a/hai-service/src/main/resources/prod/commonConfig.properties +++ b/hai-service/src/main/resources/prod/commonConfig.properties @@ -4,7 +4,8 @@ tuanYouAppSecret=f9811df6791d309bf48f4a8db9edaa45 tuanYouDieselAccount=9hp52qgg4400 tuanYouGasolineAccount=9hp52qf04400 -qinzhuUrl=https://live.qianzhu8.com/ +qinzhuUrl=https://live.qianzhu8.com +qinzhuHtmlUrl=https://m-test.qianzhu8.com qinzhuPlatformId=10458 qinzhuSecret=nnl3gg4ss0pka11t qianzhuOrderNotify=https://hsg.dctpay.com/crest/qianzhu/orderNotify