From cff7e22dd3c4c1afb051cd2866ed872a5f136aab Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 23 Jun 2021 01:25:15 +0800 Subject: [PATCH] =?UTF-8?q?'=E6=8F=90=E4=BA=A4diamond'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cweb/config/AuthConfig.java | 4 +- .../cweb/controller/HighGasController.java | 86 ++ .../cweb/controller/HighTestController.java | 64 +- .../com/hai/schedule/SynchronizeCNPC.java | 56 +- .../com/hai/dao/HighGasOilPriceMapper.java | 125 +++ .../com/hai/dao/HighGasOilPriceMapperExt.java | 33 + .../hai/dao/HighGasOilPriceSqlProvider.java | 332 ++++++ .../com/hai/dao/HighMerchantStoreMapper.java | 22 +- .../hai/dao/HighMerchantStoreSqlProvider.java | 28 + .../java/com/hai/entity/HighGasOilPrice.java | 232 ++++ .../hai/entity/HighGasOilPriceExample.java | 993 ++++++++++++++++++ .../com/hai/entity/HighMerchantStore.java | 54 +- .../hai/entity/HighMerchantStoreExample.java | 130 +++ .../hai/service/HighGasOilPriceService.java | 33 + .../impl/HighCouponCodeServiceImpl.java | 9 +- .../impl/HighGasOilPriceServiceImpl.java | 45 + 16 files changed, 2215 insertions(+), 31 deletions(-) create mode 100644 hai-cweb/src/main/java/com/cweb/controller/HighGasController.java create mode 100644 hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapper.java create mode 100644 hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapperExt.java create mode 100644 hai-service/src/main/java/com/hai/dao/HighGasOilPriceSqlProvider.java create mode 100644 hai-service/src/main/java/com/hai/entity/HighGasOilPrice.java create mode 100644 hai-service/src/main/java/com/hai/entity/HighGasOilPriceExample.java create mode 100644 hai-service/src/main/java/com/hai/service/HighGasOilPriceService.java create mode 100644 hai-service/src/main/java/com/hai/service/impl/HighGasOilPriceServiceImpl.java diff --git a/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java b/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java index b23b2444..9092780b 100644 --- a/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java +++ b/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java @@ -109,10 +109,8 @@ public class AuthConfig implements WebMvcConfigurer { .excludePathPatterns("/order/orderToH5Pay") .excludePathPatterns("/order/orderToPay") .excludePathPatterns("/test/*") - .excludePathPatterns("/outRechargeOrder/refundOrder") + .excludePathPatterns("/highGas/*") .excludePathPatterns("/wechat/*") - .excludePathPatterns("/outRechargeOrder/*") - .excludePathPatterns("/outRechargePrice/*") ; } diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java b/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java new file mode 100644 index 00000000..0fc0785d --- /dev/null +++ b/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java @@ -0,0 +1,86 @@ +package com.cweb.controller; + +import com.cweb.config.TuanYouConfig; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hai.common.security.SessionObject; +import com.hai.common.utils.CoordCommonUtil; +import com.hai.common.utils.ResponseMsgUtil; +import com.hai.entity.HighMerchantStore; +import com.hai.model.HighUserModel; +import com.hai.model.ResponseData; +import com.hai.service.HighGasOilPriceService; +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.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +@Controller +@RequestMapping(value = "/highGas") +@Api(value = "团油业务接口") +public class HighGasController { + + private static Logger log = LoggerFactory.getLogger(HighGasController.class); + + @Resource + private HighGasOilPriceService highGasOilPriceService; + + @RequestMapping(value="/getGasStoreList",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询加油站列表") + public ResponseData getGasStoreList(@RequestParam(name = "storeName", required = false) String storeName, + @RequestParam(name = "regionId", required = true) Long regionId, + @RequestParam(name = "oilNoName", required = true) String oilNoName, + @RequestParam(name = "longitude", required = true) String longitude, + @RequestParam(name = "latitude", required = true) String latitude, + @RequestParam(name = "pageNum", required = true) String pageNum, + @RequestParam(name = "pageSize", required = true) String pageSize + ) { + try { + if (StringUtils.isBlank(storeName)) { + storeName = null; + } + List> storeList = highGasOilPriceService.getStoreListByOilNo(storeName,regionId, oilNoName); + for (Map store : storeList) { + double distance = CoordCommonUtil.getDistance(Double.valueOf(store.get("latitude").toString()), Double.valueOf(store.get("longitude").toString()), Double.valueOf(latitude), Double.valueOf(longitude)); + store.put("distance", Math.round(distance/100d)/10d); + } + List> distance = storeList.stream().sorted(Comparator.comparingDouble(entry -> Double.valueOf(entry.get("distance").toString()))).collect(Collectors.toList()); + return ResponseMsgUtil.success(distance); + + } catch (Exception e) { + log.error("HighGasController -> getGasDetailByStoreKey() error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/getGasDetailByStoreKey",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "根据门店key 查询") + public ResponseData getGasDetailByStoreKey(@RequestParam(name = "storeKey", required = true) String storeKey) { + try { + + return ResponseMsgUtil.success(TuanYouConfig.queryGasInfoByGasId(storeKey)); + + } catch (Exception e) { + log.error("HighGasController -> getGasDetailByStoreKey() error!",e); + return ResponseMsgUtil.exception(e); + } + } + +} 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 a8218f88..8112ee9c 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java @@ -13,6 +13,8 @@ import com.hai.common.security.SessionObject; import com.hai.common.security.UserCenter; import com.hai.common.utils.*; import com.hai.entity.*; +import com.hai.model.HighMerchantModel; +import com.hai.model.HighMerchantStoreModel; import com.hai.model.HighUserModel; import com.hai.model.ResponseData; import com.hai.service.*; @@ -20,6 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; 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.web.bind.annotation.*; @@ -45,20 +48,73 @@ public class HighTestController { private static Logger log = LoggerFactory.getLogger(HighTestController.class); + @Resource + private HighMerchantService highMerchantService; - @RequestMapping(value = "/getOrderById", method = RequestMethod.GET) + @Resource + private HighMerchantStoreService highMerchantStoreService; + + @Resource + private HighGasOilPriceService highGasOilPriceService; + + + @RequestMapping(value = "/initTYMerchantStore", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "根据id查询订单详情") - public ResponseData getOrderById() { + public ResponseData initTYMerchantStore(@RequestParam(name = "merchantId", required = true) Long merchantId) { try { + HighMerchantModel merchant = highMerchantService.getMerchantById(merchantId); + if (merchant == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户"); + } + JSONObject jsonObject = TuanYouConfig.queryGasInfoListByPage(1, 10); JSONObject resultObject = jsonObject.getObject("result", JSONObject.class); JSONArray jsonArray = resultObject.getJSONArray("gasInfoList"); - + HighMerchantStore highMerchantStore; + HighGasOilPrice highGasOilPrice; for (Object gasObject : jsonArray) { JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(gasObject)); - System.out.println(object.getString("gasName")); + if (object.getInteger("gasStatus") == 1) { + highMerchantStore = new HighMerchantStore(); + highMerchantStore.setType(1); + highMerchantStore.setMerchantId(merchant.getId()); + highMerchantStore.setCompanyId(merchant.getCompanyId()); + highMerchantStore.setStoreKey(object.getString("gasId")); + highMerchantStore.setStoreName(object.getString("gasName")); + highMerchantStore.setStoreLogo(object.getString("gasLogoSmall")); + highMerchantStore.setRegionId(object.getLong("provinceCode")); + highMerchantStore.setRegionName(object.getString("provinceName")); + highMerchantStore.setAddress(object.getString("gasAddress")); + highMerchantStore.setLongitude(object.getString("gasAddressLongitude")); + highMerchantStore.setLatitude(object.getString("gasAddressLatitude")); + highMerchantStore.setStatus(1); + highMerchantStore.setOperatorId(0L); + highMerchantStore.setOperatorName("系统创建"); + highMerchantStore.setCreateTime(new Date()); + highMerchantStore.setUpdateTime(new Date()); + HighMerchantStoreModel merchantStoreModel = new HighMerchantStoreModel(); + BeanUtils.copyProperties(highMerchantStore, merchantStoreModel); + highMerchantStoreService.insertMerchantStore(merchantStoreModel); + + + JSONArray oilPriceList = object.getJSONArray("oilPriceList"); + for (Object oilPrice : oilPriceList) { + JSONObject oilPriceObject = JSONObject.parseObject(JSONObject.toJSONString(oilPrice)); + highGasOilPrice = new HighGasOilPrice(); + highGasOilPrice.setMerchantStoreId(merchantStoreModel.getId()); + highGasOilPrice.setOilNo(oilPriceObject.getInteger("oilNo")); + highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName")); + highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip")); + highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun")); + highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial")); + highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType")); + highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName")); + highGasOilPriceService.editGasOilPrice(highGasOilPrice); + } + + } } return ResponseMsgUtil.success(jsonArray); } catch (Exception e) { diff --git a/hai-schedule/src/main/java/com/hai/schedule/SynchronizeCNPC.java b/hai-schedule/src/main/java/com/hai/schedule/SynchronizeCNPC.java index 83bc9356..cbf58dd6 100644 --- a/hai-schedule/src/main/java/com/hai/schedule/SynchronizeCNPC.java +++ b/hai-schedule/src/main/java/com/hai/schedule/SynchronizeCNPC.java @@ -60,7 +60,61 @@ public class SynchronizeCNPC { Map bodyMap = new HashMap<>(); bodyMap.put("appId", config.getAppId()); bodyMap.put("pageNo", 1); - bodyMap.put("pageSize", 2000); + bodyMap.put("pageSize", 5000); + bodyMap.put("startTime", instance.getTime()); + bodyMap.put("endTime", new Date()); + bodyMap.put("customerCode", config.getCode()); + + Long date = new Date().getTime(); + String sha256 = encodeBySHA256(config.getSignkey() + JSON.toJSONString(bodyMap) + date); + JSONObject object = HttpsUtils.doPost("https://app.zshcqsy.com/api-provider/sapapi/open/coupon/customerRedeemcodeList", JSON.toJSONString(bodyMap), token, sha256, date); + + //JSONObject object = JSONObject.parseObject("{\"code\":1000,\"data\":{\"pageNo\":1,\"pageSize\":100,\"rowCount\":\"2\",\"list\":[{\"nodeName\":\"中国石油化工股份有限公司重庆江南石油分公司大学城南二路加油加\",\"totalAmount\":150.00,\"codeId\":\"01DIhbtPzIghPP0mPWaWzO13\",\"nodeNo\":\"50000105\",\"name\":\"重庆惠昕石化有限责任公司11.02日150元券\",\"useTime\":\"2021-04-03 06:11:14\"},{\"nodeName\":\"中国石化销售有限公司重庆三峡分公司忠县经营部三台加油站\",\"totalAmount\":100.00,\"codeId\":\"201126141728001027\",\"nodeNo\":\"50000238\",\"name\":\"重庆惠昕石化有限责任公司11.26日100元券\",\"useTime\":\"2021-04-03 15:16:03\"}]},\"success\":true}"); + + if(Objects.equals(object.get("success"), true)) { + log.error(JSONObject.toJSONString(object.get("data"))); + + Object dataJson = JSONObject.parse(JSONObject.toJSONString(object.get("data"))); + JSONObject dataObject = JSON.parseObject(JSONObject.toJSONString(dataJson)); + JSONArray list = dataObject.getJSONArray("list"); + for (Object dataJsonObject : list) { + try { + JSONObject parseObject = JSON.parseObject(JSON.toJSONString(dataJsonObject)); + String codeId = parseObject.getString("codeId"); + String nodeName = parseObject.getString("nodeName"); + Date useTime = DateUtil.format(parseObject.getString("useTime"), "yyyy-MM-dd HH:mm:ss"); + highCouponCodeService.cnpcCallbackCouponCode(codeId, useTime, nodeName); + } catch (Exception e) { + log.error("HighCouponSchedule --> expiredCoupon() error!", e); + } + } + } + } + } + } + + @Scheduled(cron="0 0 4 * * ?") // 每4小时0执行一次 + public void certification2() { + + List sinopecConfig = secSinopecConfigService.getListSinopecConfig(new HashMap<>()); + for (SecSinopecConfig config : sinopecConfig) { + Map tokenMap = new HashMap<>(); + tokenMap.put("appId", config.getAppId()); + tokenMap.put("appSecret", config.getAppSecret()); + JSONObject jsonObject = HttpsUtils.doPost("https://app.zshcqsy.com/api-provider/api/open/merchant/token", JSON.toJSONString(tokenMap)); + log.error(jsonObject.toJSONString()); + + if (jsonObject != null && jsonObject.getBoolean("success") == true) { + JSONObject data = jsonObject.getJSONObject("data"); + String token = data.getString("token"); + + Calendar instance = Calendar.getInstance(); + instance.add(Calendar.HOUR_OF_DAY, -6); + + Map bodyMap = new HashMap<>(); + bodyMap.put("appId", config.getAppId()); + bodyMap.put("pageNo", 1); + bodyMap.put("pageSize", 5000); bodyMap.put("startTime", instance.getTime()); bodyMap.put("endTime", new Date()); bodyMap.put("customerCode", config.getCode()); diff --git a/hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapper.java b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapper.java new file mode 100644 index 00000000..92370fec --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapper.java @@ -0,0 +1,125 @@ +package com.hai.dao; + +import com.hai.entity.HighGasOilPrice; +import com.hai.entity.HighGasOilPriceExample; +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 HighGasOilPriceMapper extends HighGasOilPriceMapperExt { + @SelectProvider(type=HighGasOilPriceSqlProvider.class, method="countByExample") + long countByExample(HighGasOilPriceExample example); + + @DeleteProvider(type=HighGasOilPriceSqlProvider.class, method="deleteByExample") + int deleteByExample(HighGasOilPriceExample example); + + @Delete({ + "delete from high_gas_oil_price", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into high_gas_oil_price (merchant_store_id, oil_no, ", + "oil_no_name, price_vip, ", + "price_gun, price_official, ", + "oil_type, oil_type_name, ", + "ext_1, ext_2, ext_3)", + "values (#{merchantStoreId,jdbcType=BIGINT}, #{oilNo,jdbcType=INTEGER}, ", + "#{oilNoName,jdbcType=VARCHAR}, #{priceVip,jdbcType=DECIMAL}, ", + "#{priceGun,jdbcType=DECIMAL}, #{priceOfficial,jdbcType=DECIMAL}, ", + "#{oilType,jdbcType=INTEGER}, #{oilTypeName,jdbcType=VARCHAR}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(HighGasOilPrice record); + + @InsertProvider(type=HighGasOilPriceSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(HighGasOilPrice record); + + @SelectProvider(type=HighGasOilPriceSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="merchant_store_id", property="merchantStoreId", jdbcType=JdbcType.BIGINT), + @Result(column="oil_no", property="oilNo", jdbcType=JdbcType.INTEGER), + @Result(column="oil_no_name", property="oilNoName", jdbcType=JdbcType.VARCHAR), + @Result(column="price_vip", property="priceVip", jdbcType=JdbcType.DECIMAL), + @Result(column="price_gun", property="priceGun", jdbcType=JdbcType.DECIMAL), + @Result(column="price_official", property="priceOfficial", jdbcType=JdbcType.DECIMAL), + @Result(column="oil_type", property="oilType", jdbcType=JdbcType.INTEGER), + @Result(column="oil_type_name", property="oilTypeName", jdbcType=JdbcType.VARCHAR), + @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(HighGasOilPriceExample example); + + @Select({ + "select", + "id, merchant_store_id, oil_no, oil_no_name, price_vip, price_gun, price_official, ", + "oil_type, oil_type_name, ext_1, ext_2, ext_3", + "from high_gas_oil_price", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="merchant_store_id", property="merchantStoreId", jdbcType=JdbcType.BIGINT), + @Result(column="oil_no", property="oilNo", jdbcType=JdbcType.INTEGER), + @Result(column="oil_no_name", property="oilNoName", jdbcType=JdbcType.VARCHAR), + @Result(column="price_vip", property="priceVip", jdbcType=JdbcType.DECIMAL), + @Result(column="price_gun", property="priceGun", jdbcType=JdbcType.DECIMAL), + @Result(column="price_official", property="priceOfficial", jdbcType=JdbcType.DECIMAL), + @Result(column="oil_type", property="oilType", jdbcType=JdbcType.INTEGER), + @Result(column="oil_type_name", property="oilTypeName", jdbcType=JdbcType.VARCHAR), + @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) + }) + HighGasOilPrice selectByPrimaryKey(Long id); + + @UpdateProvider(type=HighGasOilPriceSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") HighGasOilPrice record, @Param("example") HighGasOilPriceExample example); + + @UpdateProvider(type=HighGasOilPriceSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") HighGasOilPrice record, @Param("example") HighGasOilPriceExample example); + + @UpdateProvider(type=HighGasOilPriceSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(HighGasOilPrice record); + + @Update({ + "update high_gas_oil_price", + "set merchant_store_id = #{merchantStoreId,jdbcType=BIGINT},", + "oil_no = #{oilNo,jdbcType=INTEGER},", + "oil_no_name = #{oilNoName,jdbcType=VARCHAR},", + "price_vip = #{priceVip,jdbcType=DECIMAL},", + "price_gun = #{priceGun,jdbcType=DECIMAL},", + "price_official = #{priceOfficial,jdbcType=DECIMAL},", + "oil_type = #{oilType,jdbcType=INTEGER},", + "oil_type_name = #{oilTypeName,jdbcType=VARCHAR},", + "ext_1 = #{ext1,jdbcType=VARCHAR},", + "ext_2 = #{ext2,jdbcType=VARCHAR},", + "ext_3 = #{ext3,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=BIGINT}" + }) + int updateByPrimaryKey(HighGasOilPrice record); +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapperExt.java new file mode 100644 index 00000000..2c4a4d86 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapperExt.java @@ -0,0 +1,33 @@ +package com.hai.dao; + +import com.hai.entity.HighCouponRecycle; +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.type.JdbcType; + +import java.util.List; +import java.util.Map; + +/** + * mapper扩展类 + */ +public interface HighGasOilPriceMapperExt { + + @Select("" ) + List> selectStoreListByOilNo(@Param("storeName") String storeName, @Param("regionId") Long regionId, @Param("oilNoName") String oilNoName); + +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighGasOilPriceSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceSqlProvider.java new file mode 100644 index 00000000..7742a3f2 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceSqlProvider.java @@ -0,0 +1,332 @@ +package com.hai.dao; + +import com.hai.entity.HighGasOilPrice; +import com.hai.entity.HighGasOilPriceExample.Criteria; +import com.hai.entity.HighGasOilPriceExample.Criterion; +import com.hai.entity.HighGasOilPriceExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class HighGasOilPriceSqlProvider { + + public String countByExample(HighGasOilPriceExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("high_gas_oil_price"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(HighGasOilPriceExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("high_gas_oil_price"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(HighGasOilPrice record) { + SQL sql = new SQL(); + sql.INSERT_INTO("high_gas_oil_price"); + + if (record.getMerchantStoreId() != null) { + sql.VALUES("merchant_store_id", "#{merchantStoreId,jdbcType=BIGINT}"); + } + + if (record.getOilNo() != null) { + sql.VALUES("oil_no", "#{oilNo,jdbcType=INTEGER}"); + } + + if (record.getOilNoName() != null) { + sql.VALUES("oil_no_name", "#{oilNoName,jdbcType=VARCHAR}"); + } + + if (record.getPriceVip() != null) { + sql.VALUES("price_vip", "#{priceVip,jdbcType=DECIMAL}"); + } + + if (record.getPriceGun() != null) { + sql.VALUES("price_gun", "#{priceGun,jdbcType=DECIMAL}"); + } + + if (record.getPriceOfficial() != null) { + sql.VALUES("price_official", "#{priceOfficial,jdbcType=DECIMAL}"); + } + + if (record.getOilType() != null) { + sql.VALUES("oil_type", "#{oilType,jdbcType=INTEGER}"); + } + + if (record.getOilTypeName() != null) { + sql.VALUES("oil_type_name", "#{oilTypeName,jdbcType=VARCHAR}"); + } + + 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(HighGasOilPriceExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("merchant_store_id"); + sql.SELECT("oil_no"); + sql.SELECT("oil_no_name"); + sql.SELECT("price_vip"); + sql.SELECT("price_gun"); + sql.SELECT("price_official"); + sql.SELECT("oil_type"); + sql.SELECT("oil_type_name"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.FROM("high_gas_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) { + HighGasOilPrice record = (HighGasOilPrice) parameter.get("record"); + HighGasOilPriceExample example = (HighGasOilPriceExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("high_gas_oil_price"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getMerchantStoreId() != null) { + sql.SET("merchant_store_id = #{record.merchantStoreId,jdbcType=BIGINT}"); + } + + if (record.getOilNo() != null) { + sql.SET("oil_no = #{record.oilNo,jdbcType=INTEGER}"); + } + + if (record.getOilNoName() != null) { + sql.SET("oil_no_name = #{record.oilNoName,jdbcType=VARCHAR}"); + } + + if (record.getPriceVip() != null) { + sql.SET("price_vip = #{record.priceVip,jdbcType=DECIMAL}"); + } + + if (record.getPriceGun() != null) { + sql.SET("price_gun = #{record.priceGun,jdbcType=DECIMAL}"); + } + + if (record.getPriceOfficial() != null) { + sql.SET("price_official = #{record.priceOfficial,jdbcType=DECIMAL}"); + } + + if (record.getOilType() != null) { + sql.SET("oil_type = #{record.oilType,jdbcType=INTEGER}"); + } + + if (record.getOilTypeName() != null) { + sql.SET("oil_type_name = #{record.oilTypeName,jdbcType=VARCHAR}"); + } + + 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_oil_price"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("merchant_store_id = #{record.merchantStoreId,jdbcType=BIGINT}"); + sql.SET("oil_no = #{record.oilNo,jdbcType=INTEGER}"); + sql.SET("oil_no_name = #{record.oilNoName,jdbcType=VARCHAR}"); + sql.SET("price_vip = #{record.priceVip,jdbcType=DECIMAL}"); + sql.SET("price_gun = #{record.priceGun,jdbcType=DECIMAL}"); + sql.SET("price_official = #{record.priceOfficial,jdbcType=DECIMAL}"); + sql.SET("oil_type = #{record.oilType,jdbcType=INTEGER}"); + sql.SET("oil_type_name = #{record.oilTypeName,jdbcType=VARCHAR}"); + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + + HighGasOilPriceExample example = (HighGasOilPriceExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(HighGasOilPrice record) { + SQL sql = new SQL(); + sql.UPDATE("high_gas_oil_price"); + + if (record.getMerchantStoreId() != null) { + sql.SET("merchant_store_id = #{merchantStoreId,jdbcType=BIGINT}"); + } + + if (record.getOilNo() != null) { + sql.SET("oil_no = #{oilNo,jdbcType=INTEGER}"); + } + + if (record.getOilNoName() != null) { + sql.SET("oil_no_name = #{oilNoName,jdbcType=VARCHAR}"); + } + + if (record.getPriceVip() != null) { + sql.SET("price_vip = #{priceVip,jdbcType=DECIMAL}"); + } + + if (record.getPriceGun() != null) { + sql.SET("price_gun = #{priceGun,jdbcType=DECIMAL}"); + } + + if (record.getPriceOfficial() != null) { + sql.SET("price_official = #{priceOfficial,jdbcType=DECIMAL}"); + } + + if (record.getOilType() != null) { + sql.SET("oil_type = #{oilType,jdbcType=INTEGER}"); + } + + if (record.getOilTypeName() != null) { + sql.SET("oil_type_name = #{oilTypeName,jdbcType=VARCHAR}"); + } + + 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, HighGasOilPriceExample 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/dao/HighMerchantStoreMapper.java b/hai-service/src/main/java/com/hai/dao/HighMerchantStoreMapper.java index c8245082..abe17ffc 100644 --- a/hai-service/src/main/java/com/hai/dao/HighMerchantStoreMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighMerchantStoreMapper.java @@ -39,8 +39,9 @@ public interface HighMerchantStoreMapper extends HighMerchantStoreMapperExt { int deleteByPrimaryKey(Long id); @Insert({ - "insert into high_merchant_store (region_id, region_name, ", - "company_id, merchant_id, ", + "insert into high_merchant_store (`type`, region_id, ", + "region_name, company_id, ", + "merchant_id, store_logo, ", "store_key, store_name, ", "store_desc, telephone, ", "address, `status`, ", @@ -48,8 +49,9 @@ public interface HighMerchantStoreMapper extends HighMerchantStoreMapperExt { "operator_id, operator_name, ", "update_time, create_time, ", "ext_1, ext_2, ext_3)", - "values (#{regionId,jdbcType=BIGINT}, #{regionName,jdbcType=VARCHAR}, ", - "#{companyId,jdbcType=BIGINT}, #{merchantId,jdbcType=BIGINT}, ", + "values (#{type,jdbcType=INTEGER}, #{regionId,jdbcType=BIGINT}, ", + "#{regionName,jdbcType=VARCHAR}, #{companyId,jdbcType=BIGINT}, ", + "#{merchantId,jdbcType=BIGINT}, #{storeLogo,jdbcType=VARCHAR}, ", "#{storeKey,jdbcType=VARCHAR}, #{storeName,jdbcType=VARCHAR}, ", "#{storeDesc,jdbcType=VARCHAR}, #{telephone,jdbcType=VARCHAR}, ", "#{address,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", @@ -68,10 +70,12 @@ public interface HighMerchantStoreMapper extends HighMerchantStoreMapperExt { @SelectProvider(type=HighMerchantStoreSqlProvider.class, method="selectByExample") @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="region_id", property="regionId", jdbcType=JdbcType.BIGINT), @Result(column="region_name", property="regionName", jdbcType=JdbcType.VARCHAR), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="merchant_id", property="merchantId", jdbcType=JdbcType.BIGINT), + @Result(column="store_logo", property="storeLogo", jdbcType=JdbcType.VARCHAR), @Result(column="store_key", property="storeKey", jdbcType=JdbcType.VARCHAR), @Result(column="store_name", property="storeName", jdbcType=JdbcType.VARCHAR), @Result(column="store_desc", property="storeDesc", jdbcType=JdbcType.VARCHAR), @@ -92,18 +96,20 @@ public interface HighMerchantStoreMapper extends HighMerchantStoreMapperExt { @Select({ "select", - "id, region_id, region_name, company_id, merchant_id, store_key, store_name, ", - "store_desc, telephone, address, `status`, longitude, latitude, operator_id, ", + "id, `type`, region_id, region_name, company_id, merchant_id, store_logo, store_key, ", + "store_name, store_desc, telephone, address, `status`, longitude, latitude, operator_id, ", "operator_name, update_time, create_time, ext_1, ext_2, ext_3", "from high_merchant_store", "where id = #{id,jdbcType=BIGINT}" }) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="region_id", property="regionId", jdbcType=JdbcType.BIGINT), @Result(column="region_name", property="regionName", jdbcType=JdbcType.VARCHAR), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="merchant_id", property="merchantId", jdbcType=JdbcType.BIGINT), + @Result(column="store_logo", property="storeLogo", jdbcType=JdbcType.VARCHAR), @Result(column="store_key", property="storeKey", jdbcType=JdbcType.VARCHAR), @Result(column="store_name", property="storeName", jdbcType=JdbcType.VARCHAR), @Result(column="store_desc", property="storeDesc", jdbcType=JdbcType.VARCHAR), @@ -133,10 +139,12 @@ public interface HighMerchantStoreMapper extends HighMerchantStoreMapperExt { @Update({ "update high_merchant_store", - "set region_id = #{regionId,jdbcType=BIGINT},", + "set `type` = #{type,jdbcType=INTEGER},", + "region_id = #{regionId,jdbcType=BIGINT},", "region_name = #{regionName,jdbcType=VARCHAR},", "company_id = #{companyId,jdbcType=BIGINT},", "merchant_id = #{merchantId,jdbcType=BIGINT},", + "store_logo = #{storeLogo,jdbcType=VARCHAR},", "store_key = #{storeKey,jdbcType=VARCHAR},", "store_name = #{storeName,jdbcType=VARCHAR},", "store_desc = #{storeDesc,jdbcType=VARCHAR},", diff --git a/hai-service/src/main/java/com/hai/dao/HighMerchantStoreSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighMerchantStoreSqlProvider.java index ef8dc666..de41c143 100644 --- a/hai-service/src/main/java/com/hai/dao/HighMerchantStoreSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighMerchantStoreSqlProvider.java @@ -28,6 +28,10 @@ public class HighMerchantStoreSqlProvider { SQL sql = new SQL(); sql.INSERT_INTO("high_merchant_store"); + if (record.getType() != null) { + sql.VALUES("`type`", "#{type,jdbcType=INTEGER}"); + } + if (record.getRegionId() != null) { sql.VALUES("region_id", "#{regionId,jdbcType=BIGINT}"); } @@ -44,6 +48,10 @@ public class HighMerchantStoreSqlProvider { sql.VALUES("merchant_id", "#{merchantId,jdbcType=BIGINT}"); } + if (record.getStoreLogo() != null) { + sql.VALUES("store_logo", "#{storeLogo,jdbcType=VARCHAR}"); + } + if (record.getStoreKey() != null) { sql.VALUES("store_key", "#{storeKey,jdbcType=VARCHAR}"); } @@ -114,10 +122,12 @@ public class HighMerchantStoreSqlProvider { } else { sql.SELECT("id"); } + sql.SELECT("`type`"); sql.SELECT("region_id"); sql.SELECT("region_name"); sql.SELECT("company_id"); sql.SELECT("merchant_id"); + sql.SELECT("store_logo"); sql.SELECT("store_key"); sql.SELECT("store_name"); sql.SELECT("store_desc"); @@ -154,6 +164,10 @@ public class HighMerchantStoreSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); } + if (record.getType() != null) { + sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); + } + if (record.getRegionId() != null) { sql.SET("region_id = #{record.regionId,jdbcType=BIGINT}"); } @@ -170,6 +184,10 @@ public class HighMerchantStoreSqlProvider { sql.SET("merchant_id = #{record.merchantId,jdbcType=BIGINT}"); } + if (record.getStoreLogo() != null) { + sql.SET("store_logo = #{record.storeLogo,jdbcType=VARCHAR}"); + } + if (record.getStoreKey() != null) { sql.SET("store_key = #{record.storeKey,jdbcType=VARCHAR}"); } @@ -239,10 +257,12 @@ public class HighMerchantStoreSqlProvider { sql.UPDATE("high_merchant_store"); sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); sql.SET("region_id = #{record.regionId,jdbcType=BIGINT}"); sql.SET("region_name = #{record.regionName,jdbcType=VARCHAR}"); sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); sql.SET("merchant_id = #{record.merchantId,jdbcType=BIGINT}"); + sql.SET("store_logo = #{record.storeLogo,jdbcType=VARCHAR}"); sql.SET("store_key = #{record.storeKey,jdbcType=VARCHAR}"); sql.SET("store_name = #{record.storeName,jdbcType=VARCHAR}"); sql.SET("store_desc = #{record.storeDesc,jdbcType=VARCHAR}"); @@ -268,6 +288,10 @@ public class HighMerchantStoreSqlProvider { SQL sql = new SQL(); sql.UPDATE("high_merchant_store"); + if (record.getType() != null) { + sql.SET("`type` = #{type,jdbcType=INTEGER}"); + } + if (record.getRegionId() != null) { sql.SET("region_id = #{regionId,jdbcType=BIGINT}"); } @@ -284,6 +308,10 @@ public class HighMerchantStoreSqlProvider { sql.SET("merchant_id = #{merchantId,jdbcType=BIGINT}"); } + if (record.getStoreLogo() != null) { + sql.SET("store_logo = #{storeLogo,jdbcType=VARCHAR}"); + } + if (record.getStoreKey() != null) { sql.SET("store_key = #{storeKey,jdbcType=VARCHAR}"); } diff --git a/hai-service/src/main/java/com/hai/entity/HighGasOilPrice.java b/hai-service/src/main/java/com/hai/entity/HighGasOilPrice.java new file mode 100644 index 00000000..86d468b6 --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighGasOilPrice.java @@ -0,0 +1,232 @@ +package com.hai.entity; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * high_gas_oil_price + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class HighGasOilPrice implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 门店id + */ + private Long merchantStoreId; + + /** + * 油号 + */ + private Integer oilNo; + + /** + * 油品名称 + */ + private String oilNoName; + + /** + * 优惠价 + */ + private BigDecimal priceVip; + + /** + * 枪价 + */ + private BigDecimal priceGun; + + /** + * 官方指导价 + */ + private BigDecimal priceOfficial; + + /** + * 油品类型 1:汽油:2:柴油;3:天然气 + */ + private Integer oilType; + + /** + * 燃油类型名 1:汽油:2:柴油;3:天然气 + */ + private String oilTypeName; + + private String ext1; + + private String ext2; + + private String ext3; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getMerchantStoreId() { + return merchantStoreId; + } + + public void setMerchantStoreId(Long merchantStoreId) { + this.merchantStoreId = merchantStoreId; + } + + public Integer getOilNo() { + return oilNo; + } + + public void setOilNo(Integer oilNo) { + this.oilNo = oilNo; + } + + public String getOilNoName() { + return oilNoName; + } + + public void setOilNoName(String oilNoName) { + this.oilNoName = oilNoName; + } + + public BigDecimal getPriceVip() { + return priceVip; + } + + public void setPriceVip(BigDecimal priceVip) { + this.priceVip = priceVip; + } + + public BigDecimal getPriceGun() { + return priceGun; + } + + public void setPriceGun(BigDecimal priceGun) { + this.priceGun = priceGun; + } + + public BigDecimal getPriceOfficial() { + return priceOfficial; + } + + public void setPriceOfficial(BigDecimal priceOfficial) { + this.priceOfficial = priceOfficial; + } + + public Integer getOilType() { + return oilType; + } + + public void setOilType(Integer oilType) { + this.oilType = oilType; + } + + public String getOilTypeName() { + return oilTypeName; + } + + public void setOilTypeName(String oilTypeName) { + this.oilTypeName = oilTypeName; + } + + 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; + } + HighGasOilPrice other = (HighGasOilPrice) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getMerchantStoreId() == null ? other.getMerchantStoreId() == null : this.getMerchantStoreId().equals(other.getMerchantStoreId())) + && (this.getOilNo() == null ? other.getOilNo() == null : this.getOilNo().equals(other.getOilNo())) + && (this.getOilNoName() == null ? other.getOilNoName() == null : this.getOilNoName().equals(other.getOilNoName())) + && (this.getPriceVip() == null ? other.getPriceVip() == null : this.getPriceVip().equals(other.getPriceVip())) + && (this.getPriceGun() == null ? other.getPriceGun() == null : this.getPriceGun().equals(other.getPriceGun())) + && (this.getPriceOfficial() == null ? other.getPriceOfficial() == null : this.getPriceOfficial().equals(other.getPriceOfficial())) + && (this.getOilType() == null ? other.getOilType() == null : this.getOilType().equals(other.getOilType())) + && (this.getOilTypeName() == null ? other.getOilTypeName() == null : this.getOilTypeName().equals(other.getOilTypeName())) + && (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 + ((getMerchantStoreId() == null) ? 0 : getMerchantStoreId().hashCode()); + result = prime * result + ((getOilNo() == null) ? 0 : getOilNo().hashCode()); + result = prime * result + ((getOilNoName() == null) ? 0 : getOilNoName().hashCode()); + result = prime * result + ((getPriceVip() == null) ? 0 : getPriceVip().hashCode()); + result = prime * result + ((getPriceGun() == null) ? 0 : getPriceGun().hashCode()); + result = prime * result + ((getPriceOfficial() == null) ? 0 : getPriceOfficial().hashCode()); + result = prime * result + ((getOilType() == null) ? 0 : getOilType().hashCode()); + result = prime * result + ((getOilTypeName() == null) ? 0 : getOilTypeName().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(", merchantStoreId=").append(merchantStoreId); + sb.append(", oilNo=").append(oilNo); + sb.append(", oilNoName=").append(oilNoName); + sb.append(", priceVip=").append(priceVip); + sb.append(", priceGun=").append(priceGun); + sb.append(", priceOfficial=").append(priceOfficial); + sb.append(", oilType=").append(oilType); + sb.append(", oilTypeName=").append(oilTypeName); + 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/HighGasOilPriceExample.java b/hai-service/src/main/java/com/hai/entity/HighGasOilPriceExample.java new file mode 100644 index 00000000..76109a29 --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighGasOilPriceExample.java @@ -0,0 +1,993 @@ +package com.hai.entity; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +public class HighGasOilPriceExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public HighGasOilPriceExample() { + 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 andMerchantStoreIdIsNull() { + addCriterion("merchant_store_id is null"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdIsNotNull() { + addCriterion("merchant_store_id is not null"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdEqualTo(Long value) { + addCriterion("merchant_store_id =", value, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdNotEqualTo(Long value) { + addCriterion("merchant_store_id <>", value, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdGreaterThan(Long value) { + addCriterion("merchant_store_id >", value, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdGreaterThanOrEqualTo(Long value) { + addCriterion("merchant_store_id >=", value, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdLessThan(Long value) { + addCriterion("merchant_store_id <", value, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdLessThanOrEqualTo(Long value) { + addCriterion("merchant_store_id <=", value, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdIn(List values) { + addCriterion("merchant_store_id in", values, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdNotIn(List values) { + addCriterion("merchant_store_id not in", values, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdBetween(Long value1, Long value2) { + addCriterion("merchant_store_id between", value1, value2, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdNotBetween(Long value1, Long value2) { + addCriterion("merchant_store_id not between", value1, value2, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andOilNoIsNull() { + addCriterion("oil_no is null"); + return (Criteria) this; + } + + public Criteria andOilNoIsNotNull() { + addCriterion("oil_no is not null"); + return (Criteria) this; + } + + public Criteria andOilNoEqualTo(Integer value) { + addCriterion("oil_no =", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoNotEqualTo(Integer value) { + addCriterion("oil_no <>", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoGreaterThan(Integer value) { + addCriterion("oil_no >", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoGreaterThanOrEqualTo(Integer value) { + addCriterion("oil_no >=", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoLessThan(Integer value) { + addCriterion("oil_no <", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoLessThanOrEqualTo(Integer value) { + addCriterion("oil_no <=", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoIn(List values) { + addCriterion("oil_no in", values, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoNotIn(List values) { + addCriterion("oil_no not in", values, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoBetween(Integer value1, Integer value2) { + addCriterion("oil_no between", value1, value2, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoNotBetween(Integer value1, Integer value2) { + addCriterion("oil_no not between", value1, value2, "oilNo"); + 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 andPriceVipIsNull() { + addCriterion("price_vip is null"); + return (Criteria) this; + } + + public Criteria andPriceVipIsNotNull() { + addCriterion("price_vip is not null"); + return (Criteria) this; + } + + public Criteria andPriceVipEqualTo(BigDecimal value) { + addCriterion("price_vip =", value, "priceVip"); + return (Criteria) this; + } + + public Criteria andPriceVipNotEqualTo(BigDecimal value) { + addCriterion("price_vip <>", value, "priceVip"); + return (Criteria) this; + } + + public Criteria andPriceVipGreaterThan(BigDecimal value) { + addCriterion("price_vip >", value, "priceVip"); + return (Criteria) this; + } + + public Criteria andPriceVipGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("price_vip >=", value, "priceVip"); + return (Criteria) this; + } + + public Criteria andPriceVipLessThan(BigDecimal value) { + addCriterion("price_vip <", value, "priceVip"); + return (Criteria) this; + } + + public Criteria andPriceVipLessThanOrEqualTo(BigDecimal value) { + addCriterion("price_vip <=", value, "priceVip"); + return (Criteria) this; + } + + public Criteria andPriceVipIn(List values) { + addCriterion("price_vip in", values, "priceVip"); + return (Criteria) this; + } + + public Criteria andPriceVipNotIn(List values) { + addCriterion("price_vip not in", values, "priceVip"); + return (Criteria) this; + } + + public Criteria andPriceVipBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price_vip between", value1, value2, "priceVip"); + return (Criteria) this; + } + + public Criteria andPriceVipNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price_vip not between", value1, value2, "priceVip"); + return (Criteria) this; + } + + public Criteria andPriceGunIsNull() { + addCriterion("price_gun is null"); + return (Criteria) this; + } + + public Criteria andPriceGunIsNotNull() { + addCriterion("price_gun is not null"); + return (Criteria) this; + } + + public Criteria andPriceGunEqualTo(BigDecimal value) { + addCriterion("price_gun =", value, "priceGun"); + return (Criteria) this; + } + + public Criteria andPriceGunNotEqualTo(BigDecimal value) { + addCriterion("price_gun <>", value, "priceGun"); + return (Criteria) this; + } + + public Criteria andPriceGunGreaterThan(BigDecimal value) { + addCriterion("price_gun >", value, "priceGun"); + return (Criteria) this; + } + + public Criteria andPriceGunGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("price_gun >=", value, "priceGun"); + return (Criteria) this; + } + + public Criteria andPriceGunLessThan(BigDecimal value) { + addCriterion("price_gun <", value, "priceGun"); + return (Criteria) this; + } + + public Criteria andPriceGunLessThanOrEqualTo(BigDecimal value) { + addCriterion("price_gun <=", value, "priceGun"); + return (Criteria) this; + } + + public Criteria andPriceGunIn(List values) { + addCriterion("price_gun in", values, "priceGun"); + return (Criteria) this; + } + + public Criteria andPriceGunNotIn(List values) { + addCriterion("price_gun not in", values, "priceGun"); + return (Criteria) this; + } + + public Criteria andPriceGunBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price_gun between", value1, value2, "priceGun"); + return (Criteria) this; + } + + public Criteria andPriceGunNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price_gun not between", value1, value2, "priceGun"); + return (Criteria) this; + } + + public Criteria andPriceOfficialIsNull() { + addCriterion("price_official is null"); + return (Criteria) this; + } + + public Criteria andPriceOfficialIsNotNull() { + addCriterion("price_official is not null"); + return (Criteria) this; + } + + public Criteria andPriceOfficialEqualTo(BigDecimal value) { + addCriterion("price_official =", value, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialNotEqualTo(BigDecimal value) { + addCriterion("price_official <>", value, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialGreaterThan(BigDecimal value) { + addCriterion("price_official >", value, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("price_official >=", value, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialLessThan(BigDecimal value) { + addCriterion("price_official <", value, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialLessThanOrEqualTo(BigDecimal value) { + addCriterion("price_official <=", value, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialIn(List values) { + addCriterion("price_official in", values, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialNotIn(List values) { + addCriterion("price_official not in", values, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price_official between", value1, value2, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price_official not between", value1, value2, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andOilTypeIsNull() { + addCriterion("oil_type is null"); + return (Criteria) this; + } + + public Criteria andOilTypeIsNotNull() { + addCriterion("oil_type is not null"); + return (Criteria) this; + } + + public Criteria andOilTypeEqualTo(Integer value) { + addCriterion("oil_type =", value, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeNotEqualTo(Integer value) { + addCriterion("oil_type <>", value, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeGreaterThan(Integer value) { + addCriterion("oil_type >", value, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("oil_type >=", value, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeLessThan(Integer value) { + addCriterion("oil_type <", value, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeLessThanOrEqualTo(Integer value) { + addCriterion("oil_type <=", value, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeIn(List values) { + addCriterion("oil_type in", values, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeNotIn(List values) { + addCriterion("oil_type not in", values, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeBetween(Integer value1, Integer value2) { + addCriterion("oil_type between", value1, value2, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeNotBetween(Integer value1, Integer value2) { + addCriterion("oil_type not between", value1, value2, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeNameIsNull() { + addCriterion("oil_type_name is null"); + return (Criteria) this; + } + + public Criteria andOilTypeNameIsNotNull() { + addCriterion("oil_type_name is not null"); + return (Criteria) this; + } + + public Criteria andOilTypeNameEqualTo(String value) { + addCriterion("oil_type_name =", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameNotEqualTo(String value) { + addCriterion("oil_type_name <>", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameGreaterThan(String value) { + addCriterion("oil_type_name >", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameGreaterThanOrEqualTo(String value) { + addCriterion("oil_type_name >=", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameLessThan(String value) { + addCriterion("oil_type_name <", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameLessThanOrEqualTo(String value) { + addCriterion("oil_type_name <=", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameLike(String value) { + addCriterion("oil_type_name like", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameNotLike(String value) { + addCriterion("oil_type_name not like", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameIn(List values) { + addCriterion("oil_type_name in", values, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameNotIn(List values) { + addCriterion("oil_type_name not in", values, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameBetween(String value1, String value2) { + addCriterion("oil_type_name between", value1, value2, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameNotBetween(String value1, String value2) { + addCriterion("oil_type_name not between", value1, value2, "oilTypeName"); + 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/entity/HighMerchantStore.java b/hai-service/src/main/java/com/hai/entity/HighMerchantStore.java index 05993a60..a230adb3 100644 --- a/hai-service/src/main/java/com/hai/entity/HighMerchantStore.java +++ b/hai-service/src/main/java/com/hai/entity/HighMerchantStore.java @@ -18,6 +18,11 @@ public class HighMerchantStore implements Serializable { */ private Long id; + /** + * 类型 1：团油门店 + */ + private Integer type; + /** * 区域 */ @@ -38,6 +43,11 @@ public class HighMerchantStore implements Serializable { */ private Long merchantId; + /** + * 门店logo + */ + private String storeLogo; + /** * 门店编号 */ @@ -108,18 +118,6 @@ public class HighMerchantStore implements Serializable { private HighMerchant highMerchant; - public HighMerchant getHighMerchant() { - return highMerchant; - } - - public void setHighMerchant(HighMerchant highMerchant) { - this.highMerchant = highMerchant; - } - - public static long getSerialVersionUID() { - return serialVersionUID; - } - private static final long serialVersionUID = 1L; public Double getDistance() { @@ -130,6 +128,14 @@ public class HighMerchantStore implements Serializable { this.distance = distance; } + public HighMerchant getHighMerchant() { + return highMerchant; + } + + public void setHighMerchant(HighMerchant highMerchant) { + this.highMerchant = highMerchant; + } + public Long getId() { return id; } @@ -138,6 +144,14 @@ public class HighMerchantStore implements Serializable { this.id = id; } + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + public Long getRegionId() { return regionId; } @@ -170,6 +184,14 @@ public class HighMerchantStore implements Serializable { this.merchantId = merchantId; } + public String getStoreLogo() { + return storeLogo; + } + + public void setStoreLogo(String storeLogo) { + this.storeLogo = storeLogo; + } + public String getStoreKey() { return storeKey; } @@ -303,10 +325,12 @@ public class HighMerchantStore implements Serializable { } HighMerchantStore other = (HighMerchantStore) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) && (this.getRegionId() == null ? other.getRegionId() == null : this.getRegionId().equals(other.getRegionId())) && (this.getRegionName() == null ? other.getRegionName() == null : this.getRegionName().equals(other.getRegionName())) && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) && (this.getMerchantId() == null ? other.getMerchantId() == null : this.getMerchantId().equals(other.getMerchantId())) + && (this.getStoreLogo() == null ? other.getStoreLogo() == null : this.getStoreLogo().equals(other.getStoreLogo())) && (this.getStoreKey() == null ? other.getStoreKey() == null : this.getStoreKey().equals(other.getStoreKey())) && (this.getStoreName() == null ? other.getStoreName() == null : this.getStoreName().equals(other.getStoreName())) && (this.getStoreDesc() == null ? other.getStoreDesc() == null : this.getStoreDesc().equals(other.getStoreDesc())) @@ -329,10 +353,12 @@ public class HighMerchantStore implements Serializable { final int prime = 31; int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); result = prime * result + ((getRegionId() == null) ? 0 : getRegionId().hashCode()); result = prime * result + ((getRegionName() == null) ? 0 : getRegionName().hashCode()); result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); result = prime * result + ((getMerchantId() == null) ? 0 : getMerchantId().hashCode()); + result = prime * result + ((getStoreLogo() == null) ? 0 : getStoreLogo().hashCode()); result = prime * result + ((getStoreKey() == null) ? 0 : getStoreKey().hashCode()); result = prime * result + ((getStoreName() == null) ? 0 : getStoreName().hashCode()); result = prime * result + ((getStoreDesc() == null) ? 0 : getStoreDesc().hashCode()); @@ -358,10 +384,12 @@ public class HighMerchantStore implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); + sb.append(", type=").append(type); sb.append(", regionId=").append(regionId); sb.append(", regionName=").append(regionName); sb.append(", companyId=").append(companyId); sb.append(", merchantId=").append(merchantId); + sb.append(", storeLogo=").append(storeLogo); sb.append(", storeKey=").append(storeKey); sb.append(", storeName=").append(storeName); sb.append(", storeDesc=").append(storeDesc); @@ -381,4 +409,4 @@ public class HighMerchantStore implements Serializable { sb.append("]"); return sb.toString(); } -} +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/HighMerchantStoreExample.java b/hai-service/src/main/java/com/hai/entity/HighMerchantStoreExample.java index bb7e6237..56398e5e 100644 --- a/hai-service/src/main/java/com/hai/entity/HighMerchantStoreExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighMerchantStoreExample.java @@ -185,6 +185,66 @@ public class HighMerchantStoreExample { return (Criteria) this; } + public Criteria andTypeIsNull() { + addCriterion("`type` is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("`type` is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(Integer value) { + addCriterion("`type` =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(Integer value) { + addCriterion("`type` <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(Integer value) { + addCriterion("`type` >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("`type` >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(Integer value) { + addCriterion("`type` <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(Integer value) { + addCriterion("`type` <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("`type` in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("`type` not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(Integer value1, Integer value2) { + addCriterion("`type` between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(Integer value1, Integer value2) { + addCriterion("`type` not between", value1, value2, "type"); + return (Criteria) this; + } + public Criteria andRegionIdIsNull() { addCriterion("region_id is null"); return (Criteria) this; @@ -435,6 +495,76 @@ public class HighMerchantStoreExample { return (Criteria) this; } + public Criteria andStoreLogoIsNull() { + addCriterion("store_logo is null"); + return (Criteria) this; + } + + public Criteria andStoreLogoIsNotNull() { + addCriterion("store_logo is not null"); + return (Criteria) this; + } + + public Criteria andStoreLogoEqualTo(String value) { + addCriterion("store_logo =", value, "storeLogo"); + return (Criteria) this; + } + + public Criteria andStoreLogoNotEqualTo(String value) { + addCriterion("store_logo <>", value, "storeLogo"); + return (Criteria) this; + } + + public Criteria andStoreLogoGreaterThan(String value) { + addCriterion("store_logo >", value, "storeLogo"); + return (Criteria) this; + } + + public Criteria andStoreLogoGreaterThanOrEqualTo(String value) { + addCriterion("store_logo >=", value, "storeLogo"); + return (Criteria) this; + } + + public Criteria andStoreLogoLessThan(String value) { + addCriterion("store_logo <", value, "storeLogo"); + return (Criteria) this; + } + + public Criteria andStoreLogoLessThanOrEqualTo(String value) { + addCriterion("store_logo <=", value, "storeLogo"); + return (Criteria) this; + } + + public Criteria andStoreLogoLike(String value) { + addCriterion("store_logo like", value, "storeLogo"); + return (Criteria) this; + } + + public Criteria andStoreLogoNotLike(String value) { + addCriterion("store_logo not like", value, "storeLogo"); + return (Criteria) this; + } + + public Criteria andStoreLogoIn(List values) { + addCriterion("store_logo in", values, "storeLogo"); + return (Criteria) this; + } + + public Criteria andStoreLogoNotIn(List values) { + addCriterion("store_logo not in", values, "storeLogo"); + return (Criteria) this; + } + + public Criteria andStoreLogoBetween(String value1, String value2) { + addCriterion("store_logo between", value1, value2, "storeLogo"); + return (Criteria) this; + } + + public Criteria andStoreLogoNotBetween(String value1, String value2) { + addCriterion("store_logo not between", value1, value2, "storeLogo"); + return (Criteria) this; + } + public Criteria andStoreKeyIsNull() { addCriterion("store_key is null"); return (Criteria) this; diff --git a/hai-service/src/main/java/com/hai/service/HighGasOilPriceService.java b/hai-service/src/main/java/com/hai/service/HighGasOilPriceService.java new file mode 100644 index 00000000..ec1d9c51 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/HighGasOilPriceService.java @@ -0,0 +1,33 @@ +package com.hai.service; + +import com.hai.entity.HighGasOilPrice; + +import java.util.List; +import java.util.Map; + +public interface HighGasOilPriceService { + + /** + * 编辑 + * @param highGasOilPrice + */ + void editGasOilPrice(HighGasOilPrice highGasOilPrice); + + /** + * 根据门店id 查询 + * @param storeId + * @return + */ + HighGasOilPrice getGasOilPriceByStore(Long storeId); + + /** + * 根据区域和油号查询门店 + * @param regionId + * @param oilNoName + * @return + */ + List> getStoreListByOilNo(String storeName,Long regionId, String oilNoName); + + + +} diff --git a/hai-service/src/main/java/com/hai/service/impl/HighCouponCodeServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighCouponCodeServiceImpl.java index cc457746..72b8a334 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighCouponCodeServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighCouponCodeServiceImpl.java @@ -165,13 +165,16 @@ public class HighCouponCodeServiceImpl implements HighCouponCodeService { userCoupon.setStatus(2); // 状态 0:已过期 1：未使用 2：已使用 highUserCouponService.updateUserCoupon(userCoupon); -/* HighChildOrderExample example = new HighChildOrderExample(); + if (code.getChildOrderId() != null) { + highOrderService.childOrderComplete(code.getChildOrderId()); + } + /*HighChildOrderExample example = new HighChildOrderExample(); example.createCriteria().andMemIdEqualTo(userCoupon.getUserId()).andGoodsTypeEqualTo(1).andGoodsIdEqualTo(userCoupon.getCouponId()).andChildOrdeStatusEqualTo(2); List childOrderList = highChildOrderMapper.selectByExample(example); if (childOrderList.size() > 0) { highOrderService.childOrderComplete(childOrderList.get(0).getId()); - }*/ - /*HighChildOrder order = highOrderService.getChildOrderByUserGoods(userCoupon.getUserId(), 1, userCoupon.getCouponId()); + } + HighChildOrder order = highOrderService.getChildOrderByUserGoods(userCoupon.getUserId(), 1, userCoupon.getCouponId()); if (order == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到订单"); }*/ diff --git a/hai-service/src/main/java/com/hai/service/impl/HighGasOilPriceServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighGasOilPriceServiceImpl.java new file mode 100644 index 00000000..00648639 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/impl/HighGasOilPriceServiceImpl.java @@ -0,0 +1,45 @@ +package com.hai.service.impl; + +import com.hai.dao.HighGasOilPriceMapper; +import com.hai.entity.HighGasOilPrice; +import com.hai.entity.HighGasOilPriceExample; +import com.hai.service.HighGasOilPriceService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +@Service("highGasOilPriceService") +public class HighGasOilPriceServiceImpl implements HighGasOilPriceService { + + @Resource + private HighGasOilPriceMapper highGasOilPriceMapper; + + @Override + public void editGasOilPrice(HighGasOilPrice highGasOilPrice) { + if (highGasOilPrice.getId() != null) { + highGasOilPriceMapper.updateByPrimaryKey(highGasOilPrice); + } else { + highGasOilPriceMapper.insert(highGasOilPrice); + } + } + + @Override + public HighGasOilPrice getGasOilPriceByStore(Long storeId) { + HighGasOilPriceExample example = new HighGasOilPriceExample(); + example.createCriteria().andMerchantStoreIdEqualTo(storeId); + List list = highGasOilPriceMapper.selectByExample(example); + if (list.size() > 0) { + return list.get(0); + } + return null; + } + + @Override + public List> getStoreListByOilNo(String storeName,Long regionId, String oilNoName) { + return highGasOilPriceMapper.selectStoreListByOilNo(storeName,regionId,oilNoName); + } + + +}