diff --git a/hai-order/src/main/java/com/web/controller/OrderController.java b/hai-order/src/main/java/com/web/controller/OrderController.java index dbb7a0af..784c87bd 100644 --- a/hai-order/src/main/java/com/web/controller/OrderController.java +++ b/hai-order/src/main/java/com/web/controller/OrderController.java @@ -218,7 +218,7 @@ public class OrderController { param.put("status", status); PageHelper.startPage(pageNum, pageSize); - return ResponseMsgUtil.success(new PageInfo<>()); + return ResponseMsgUtil.success(new PageInfo<>(orderService.getOrderList(param))); } catch (Exception e) { log.error("OrderController -> getUserOrderList() error!",e); diff --git a/hai-order/src/main/java/com/web/controller/TestController.java b/hai-order/src/main/java/com/web/controller/TestController.java index 4994ce5b..20db0f9b 100644 --- a/hai-order/src/main/java/com/web/controller/TestController.java +++ b/hai-order/src/main/java/com/web/controller/TestController.java @@ -1 +1 @@ -package com.web.controller; import com.hai.common.utils.*; import com.hai.config.HuiLianTongUnionCardConfig; import com.hai.entity.HighOrder; import com.hai.model.ResponseData; import com.hai.order.model.CreateOrderModel; import com.hai.order.service.OrderService; import com.hai.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.rocketmq.client.producer.SendCallback; import org.apache.rocketmq.client.producer.SendResult; import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.integration.support.MessageBuilder; 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 java.util.ArrayList; import java.util.LinkedList; import java.util.List; /** * @Auther: 胡锐 * @Description: * @Date: 2021/3/26 23:08 */ @Controller @RequestMapping(value = "/test") @Api(value = "订单接口") public class TestController { private static Logger log = LoggerFactory.getLogger(TestController.class); @Autowired private RocketMQTemplate rocketMQTemplate; @Resource private OrderService orderService; @Resource private RedisUtil redisUtil; @Autowired private RedisTemplate redisTemplate; @RequestMapping(value = "/q", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "") public ResponseData q(@RequestParam(name = "topicGroup", required = true) String topicGroup, @RequestParam(name = "body", required = true) String body) { try { return ResponseMsgUtil.success(HuiLianTongUnionCardConfig.queryBalance("8800030132003656618")); } catch (Exception e) { log.error("HighUserCardController --> rocketMq() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/rocketMq", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "") public ResponseData rocketMq(@RequestParam(name = "topicGroup", required = true) String topicGroup, @RequestParam(name = "body", required = true) String body) { try { long startTime = System.currentTimeMillis(); // org.springframework.messaging.Message message = MessageBuilder.withPayload(order).build(); CreateOrderModel createOrder = new CreateOrderModel(); //发送对象消息 HighOrder order = rocketMQTemplate.sendAndReceive("order-topic:create", createOrder, HighOrder.class); System.out.println("订单号：" + order.getOrderNo()); // SendResult sendResult = rocketMQTemplate.syncSend("order-topic:create", message, 3000); /*List list = new LinkedList<>(); for (int i = 0; i <= 100;i++) { list.add(orderService.getDetailByOrderNo("HF2022080918014365701")); *//* list.add(orderService.getDetailByOrderNo("HF2022080918014365701"));*//* *//* updateUserWithRedisLock("coupon_" + couponKey, i+""); new Thread(() -> {*//* *//* redisTemplate.opsForValue().setIfAbsent("coupon_" + couponKey, i); System.out.println("加入数据" + i);*//* // redisTemplate.delete("coupon" + couponKey); // System.out.println("释放数据" + index); *//* });*//* }*/ System.out.println(System.currentTimeMillis() - startTime); return ResponseMsgUtil.success(null); } catch (Exception e) { log.error("HighUserCardController --> rocketMq() error!", e); return ResponseMsgUtil.exception(e); } } public void updateUserWithRedisLock(String couponKey, String value) throws InterruptedException { // 占分布式锁，去redis占坑 // 1. 分布式锁占坑 Boolean lock = redisTemplate.opsForValue().setIfAbsent("coupon" + couponKey, value); if(lock) { //加锁成功... // todo business System.out.println("加锁成功： " + value); redisTemplate.delete("coupon" + couponKey); //删除key，释放锁 } else { System.out.println("加锁失败"); /* Thread.sleep(100); // 加锁失败，重试 updateUserWithRedisLock("sysUser");*/ } } } \ No newline at end of file +package com.web.controller; import com.alibaba.fastjson.JSONObject; import com.hai.common.utils.*; import com.hai.config.HuiLianTongConfig; import com.hai.config.HuiLianTongUnionCardConfig; import com.hai.entity.HighOrder; import com.hai.model.ResponseData; import com.hai.order.model.CreateOrderModel; import com.hai.order.service.OrderService; import com.hai.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.rocketmq.client.producer.SendCallback; import org.apache.rocketmq.client.producer.SendResult; import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.integration.support.MessageBuilder; 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 java.util.ArrayList; import java.util.LinkedList; import java.util.List; /** * @Auther: 胡锐 * @Description: * @Date: 2021/3/26 23:08 */ @Controller @RequestMapping(value = "/test") @Api(value = "订单接口") public class TestController { private static Logger log = LoggerFactory.getLogger(TestController.class); @Autowired private RocketMQTemplate rocketMQTemplate; @Resource private OrderService orderService; @Resource private RedisUtil redisUtil; @Autowired private RedisTemplate redisTemplate; @RequestMapping(value = "/q", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "") public ResponseData q() { try { JSONObject order = HuiLianTongConfig.getPayOrderByCouNo("3D3F3D3D3F373F36373836373D3F3A37383C3F"); if (order != null){ return ResponseMsgUtil.success(HuiLianTongUnionCardConfig.resolveResponse(order.getString("data"))); } return ResponseMsgUtil.success(null); } catch (Exception e) { log.error("HighUserCardController --> rocketMq() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/rocketMq", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "") public ResponseData rocketMq(@RequestParam(name = "topicGroup", required = true) String topicGroup, @RequestParam(name = "body", required = true) String body) { try { long startTime = System.currentTimeMillis(); // org.springframework.messaging.Message message = MessageBuilder.withPayload(order).build(); CreateOrderModel createOrder = new CreateOrderModel(); //发送对象消息 HighOrder order = rocketMQTemplate.sendAndReceive("order-topic:create", createOrder, HighOrder.class); System.out.println("订单号：" + order.getOrderNo()); // SendResult sendResult = rocketMQTemplate.syncSend("order-topic:create", message, 3000); /*List list = new LinkedList<>(); for (int i = 0; i <= 100;i++) { list.add(orderService.getDetailByOrderNo("HF2022080918014365701")); *//* list.add(orderService.getDetailByOrderNo("HF2022080918014365701"));*//* *//* updateUserWithRedisLock("coupon_" + couponKey, i+""); new Thread(() -> {*//* *//* redisTemplate.opsForValue().setIfAbsent("coupon_" + couponKey, i); System.out.println("加入数据" + i);*//* // redisTemplate.delete("coupon" + couponKey); // System.out.println("释放数据" + index); *//* });*//* }*/ System.out.println(System.currentTimeMillis() - startTime); return ResponseMsgUtil.success(null); } catch (Exception e) { log.error("HighUserCardController --> rocketMq() error!", e); return ResponseMsgUtil.exception(e); } } public void updateUserWithRedisLock(String couponKey, String value) throws InterruptedException { // 占分布式锁，去redis占坑 // 1. 分布式锁占坑 Boolean lock = redisTemplate.opsForValue().setIfAbsent("coupon" + couponKey, value); if(lock) { //加锁成功... // todo business System.out.println("加锁成功： " + value); redisTemplate.delete("coupon" + couponKey); //删除key，释放锁 } else { System.out.println("加锁失败"); /* Thread.sleep(100); // 加锁失败，重试 updateUserWithRedisLock("sysUser");*/ } } } \ No newline at end of file diff --git a/hai-order/src/main/resources/prod/application.yml b/hai-order/src/main/resources/prod/application.yml index f6b86858..fd57f96a 100644 --- a/hai-order/src/main/resources/prod/application.yml +++ b/hai-order/src/main/resources/prod/application.yml @@ -1,10 +1,10 @@ server: - port: 9302 + port: 9304 servlet: - context-path: /crest + context-path: /order #配置是否为debug模式，debug模式下，不开启权限校验 -debug: false +debug: true #datasource数据源设置 spring: @@ -48,7 +48,25 @@ spring: encoding: UTF-8 content-type: text/html mode: HTML5 - + #MQTT配置信息 + mqtt: + #MQTT服务地址 + url: ws://139.159.177.244:8083/mqtt + #用户名 + username: printer_provider + #密码 + password: 123654 + #客户端id(不能重复) + # client: + # id: provider-id + #MQTT默认的消息推送主题，实际可在调用接口是指定 + # default: + # topic: topic +rocketmq: + name-server: 139.159.177.244:9876 + producer: + #必须指定group + group: default-group mybatis: mapperLocations: - classpath*:sqlmap*/*.xml diff --git a/hai-service/src/main/java/com/hai/dao/HighGasOrderMapper.java b/hai-service/src/main/java/com/hai/dao/HighGasOrderMapper.java new file mode 100644 index 00000000..564a4a7f --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasOrderMapper.java @@ -0,0 +1,282 @@ +package com.hai.dao; + +import com.hai.entity.HighGasOrder; +import com.hai.entity.HighGasOrderExample; +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 HighGasOrderMapper extends HighGasOrderMapperExt { + @SelectProvider(type=HighGasOrderSqlProvider.class, method="countByExample") + long countByExample(HighGasOrderExample example); + + @DeleteProvider(type=HighGasOrderSqlProvider.class, method="deleteByExample") + int deleteByExample(HighGasOrderExample example); + + @Delete({ + "delete from high_gas_order", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into high_gas_order (order_no, child_order_no, ", + "channel_type, channel_order_no, ", + "mem_id, mem_phone, ", + "mer_id, mer_name, store_id, ", + "store_name, gas_refuel_price, ", + "gas_oil_no, gas_gun_no, ", + "gas_oil_type, gas_price_platform, ", + "gas_price_gun, gas_price_vip, ", + "gas_price_official, gas_price_cost, ", + "gas_price_cost_total, gas_price_channel_pay, ", + "gas_oil_liters, gas_discount, ", + "gas_oil_subsidy, gas_liters_preferences, ", + "gas_price_preferences, gas_class_group_id, ", + "gas_class_group_name, gas_class_group_task_id, ", + "gas_staff_id, gas_staff_name, ", + "gas_salesman_id, gas_salesman_name, ", + "gas_agent_id, gas_agent_name, ", + "gas_org_id, gas_org_name, ", + "`status`, create_time, ", + "pay_time, finish_time, ", + "refund_time, refund_remarks, ", + "ext_1, ext_2, ext_3, ", + "ext_4, ext_5, ext_6)", + "values (#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ", + "#{channelType,jdbcType=INTEGER}, #{channelOrderNo,jdbcType=VARCHAR}, ", + "#{memId,jdbcType=BIGINT}, #{memPhone,jdbcType=VARCHAR}, ", + "#{merId,jdbcType=BIGINT}, #{merName,jdbcType=VARCHAR}, #{storeId,jdbcType=BIGINT}, ", + "#{storeName,jdbcType=VARCHAR}, #{gasRefuelPrice,jdbcType=DECIMAL}, ", + "#{gasOilNo,jdbcType=VARCHAR}, #{gasGunNo,jdbcType=VARCHAR}, ", + "#{gasOilType,jdbcType=INTEGER}, #{gasPricePlatform,jdbcType=DECIMAL}, ", + "#{gasPriceGun,jdbcType=DECIMAL}, #{gasPriceVip,jdbcType=DECIMAL}, ", + "#{gasPriceOfficial,jdbcType=DECIMAL}, #{gasPriceCost,jdbcType=DECIMAL}, ", + "#{gasPriceCostTotal,jdbcType=DECIMAL}, #{gasPriceChannelPay,jdbcType=DECIMAL}, ", + "#{gasOilLiters,jdbcType=DECIMAL}, #{gasDiscount,jdbcType=DECIMAL}, ", + "#{gasOilSubsidy,jdbcType=DECIMAL}, #{gasLitersPreferences,jdbcType=DECIMAL}, ", + "#{gasPricePreferences,jdbcType=DECIMAL}, #{gasClassGroupId,jdbcType=BIGINT}, ", + "#{gasClassGroupName,jdbcType=VARCHAR}, #{gasClassGroupTaskId,jdbcType=BIGINT}, ", + "#{gasStaffId,jdbcType=BIGINT}, #{gasStaffName,jdbcType=VARCHAR}, ", + "#{gasSalesmanId,jdbcType=BIGINT}, #{gasSalesmanName,jdbcType=VARCHAR}, ", + "#{gasAgentId,jdbcType=BIGINT}, #{gasAgentName,jdbcType=VARCHAR}, ", + "#{gasOrgId,jdbcType=BIGINT}, #{gasOrgName,jdbcType=VARCHAR}, ", + "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{payTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ", + "#{refundTime,jdbcType=TIMESTAMP}, #{refundRemarks,jdbcType=VARCHAR}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, ", + "#{ext4,jdbcType=VARCHAR}, #{ext5,jdbcType=VARCHAR}, #{ext6,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(HighGasOrder record); + + @InsertProvider(type=HighGasOrderSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(HighGasOrder record); + + @SelectProvider(type=HighGasOrderSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="channel_type", property="channelType", jdbcType=JdbcType.INTEGER), + @Result(column="channel_order_no", property="channelOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="mem_id", property="memId", jdbcType=JdbcType.BIGINT), + @Result(column="mem_phone", property="memPhone", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_name", property="merName", jdbcType=JdbcType.VARCHAR), + @Result(column="store_id", property="storeId", jdbcType=JdbcType.BIGINT), + @Result(column="store_name", property="storeName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_refuel_price", property="gasRefuelPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_oil_no", property="gasOilNo", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_gun_no", property="gasGunNo", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_oil_type", property="gasOilType", jdbcType=JdbcType.INTEGER), + @Result(column="gas_price_platform", property="gasPricePlatform", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_gun", property="gasPriceGun", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_vip", property="gasPriceVip", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_official", property="gasPriceOfficial", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_cost", property="gasPriceCost", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_cost_total", property="gasPriceCostTotal", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_channel_pay", property="gasPriceChannelPay", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_oil_liters", property="gasOilLiters", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_discount", property="gasDiscount", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_oil_subsidy", property="gasOilSubsidy", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_liters_preferences", property="gasLitersPreferences", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_preferences", property="gasPricePreferences", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_class_group_id", property="gasClassGroupId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_class_group_name", property="gasClassGroupName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_class_group_task_id", property="gasClassGroupTaskId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_staff_id", property="gasStaffId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_staff_name", property="gasStaffName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_salesman_id", property="gasSalesmanId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_salesman_name", property="gasSalesmanName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_agent_id", property="gasAgentId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_agent_name", property="gasAgentName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_org_id", property="gasOrgId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_org_name", property="gasOrgName", jdbcType=JdbcType.VARCHAR), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="refund_remarks", property="refundRemarks", 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), + @Result(column="ext_4", property="ext4", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_5", property="ext5", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_6", property="ext6", jdbcType=JdbcType.VARCHAR) + }) + List selectByExample(HighGasOrderExample example); + + @Select({ + "select", + "id, order_no, child_order_no, channel_type, channel_order_no, mem_id, mem_phone, ", + "mer_id, mer_name, store_id, store_name, gas_refuel_price, gas_oil_no, gas_gun_no, ", + "gas_oil_type, gas_price_platform, gas_price_gun, gas_price_vip, gas_price_official, ", + "gas_price_cost, gas_price_cost_total, gas_price_channel_pay, gas_oil_liters, ", + "gas_discount, gas_oil_subsidy, gas_liters_preferences, gas_price_preferences, ", + "gas_class_group_id, gas_class_group_name, gas_class_group_task_id, gas_staff_id, ", + "gas_staff_name, gas_salesman_id, gas_salesman_name, gas_agent_id, gas_agent_name, ", + "gas_org_id, gas_org_name, `status`, create_time, pay_time, finish_time, refund_time, ", + "refund_remarks, ext_1, ext_2, ext_3, ext_4, ext_5, ext_6", + "from high_gas_order", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="channel_type", property="channelType", jdbcType=JdbcType.INTEGER), + @Result(column="channel_order_no", property="channelOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="mem_id", property="memId", jdbcType=JdbcType.BIGINT), + @Result(column="mem_phone", property="memPhone", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_name", property="merName", jdbcType=JdbcType.VARCHAR), + @Result(column="store_id", property="storeId", jdbcType=JdbcType.BIGINT), + @Result(column="store_name", property="storeName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_refuel_price", property="gasRefuelPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_oil_no", property="gasOilNo", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_gun_no", property="gasGunNo", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_oil_type", property="gasOilType", jdbcType=JdbcType.INTEGER), + @Result(column="gas_price_platform", property="gasPricePlatform", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_gun", property="gasPriceGun", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_vip", property="gasPriceVip", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_official", property="gasPriceOfficial", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_cost", property="gasPriceCost", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_cost_total", property="gasPriceCostTotal", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_channel_pay", property="gasPriceChannelPay", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_oil_liters", property="gasOilLiters", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_discount", property="gasDiscount", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_oil_subsidy", property="gasOilSubsidy", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_liters_preferences", property="gasLitersPreferences", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_price_preferences", property="gasPricePreferences", jdbcType=JdbcType.DECIMAL), + @Result(column="gas_class_group_id", property="gasClassGroupId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_class_group_name", property="gasClassGroupName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_class_group_task_id", property="gasClassGroupTaskId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_staff_id", property="gasStaffId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_staff_name", property="gasStaffName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_salesman_id", property="gasSalesmanId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_salesman_name", property="gasSalesmanName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_agent_id", property="gasAgentId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_agent_name", property="gasAgentName", jdbcType=JdbcType.VARCHAR), + @Result(column="gas_org_id", property="gasOrgId", jdbcType=JdbcType.BIGINT), + @Result(column="gas_org_name", property="gasOrgName", jdbcType=JdbcType.VARCHAR), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="refund_remarks", property="refundRemarks", 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), + @Result(column="ext_4", property="ext4", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_5", property="ext5", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_6", property="ext6", jdbcType=JdbcType.VARCHAR) + }) + HighGasOrder selectByPrimaryKey(Long id); + + @UpdateProvider(type=HighGasOrderSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") HighGasOrder record, @Param("example") HighGasOrderExample example); + + @UpdateProvider(type=HighGasOrderSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") HighGasOrder record, @Param("example") HighGasOrderExample example); + + @UpdateProvider(type=HighGasOrderSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(HighGasOrder record); + + @Update({ + "update high_gas_order", + "set order_no = #{orderNo,jdbcType=VARCHAR},", + "child_order_no = #{childOrderNo,jdbcType=VARCHAR},", + "channel_type = #{channelType,jdbcType=INTEGER},", + "channel_order_no = #{channelOrderNo,jdbcType=VARCHAR},", + "mem_id = #{memId,jdbcType=BIGINT},", + "mem_phone = #{memPhone,jdbcType=VARCHAR},", + "mer_id = #{merId,jdbcType=BIGINT},", + "mer_name = #{merName,jdbcType=VARCHAR},", + "store_id = #{storeId,jdbcType=BIGINT},", + "store_name = #{storeName,jdbcType=VARCHAR},", + "gas_refuel_price = #{gasRefuelPrice,jdbcType=DECIMAL},", + "gas_oil_no = #{gasOilNo,jdbcType=VARCHAR},", + "gas_gun_no = #{gasGunNo,jdbcType=VARCHAR},", + "gas_oil_type = #{gasOilType,jdbcType=INTEGER},", + "gas_price_platform = #{gasPricePlatform,jdbcType=DECIMAL},", + "gas_price_gun = #{gasPriceGun,jdbcType=DECIMAL},", + "gas_price_vip = #{gasPriceVip,jdbcType=DECIMAL},", + "gas_price_official = #{gasPriceOfficial,jdbcType=DECIMAL},", + "gas_price_cost = #{gasPriceCost,jdbcType=DECIMAL},", + "gas_price_cost_total = #{gasPriceCostTotal,jdbcType=DECIMAL},", + "gas_price_channel_pay = #{gasPriceChannelPay,jdbcType=DECIMAL},", + "gas_oil_liters = #{gasOilLiters,jdbcType=DECIMAL},", + "gas_discount = #{gasDiscount,jdbcType=DECIMAL},", + "gas_oil_subsidy = #{gasOilSubsidy,jdbcType=DECIMAL},", + "gas_liters_preferences = #{gasLitersPreferences,jdbcType=DECIMAL},", + "gas_price_preferences = #{gasPricePreferences,jdbcType=DECIMAL},", + "gas_class_group_id = #{gasClassGroupId,jdbcType=BIGINT},", + "gas_class_group_name = #{gasClassGroupName,jdbcType=VARCHAR},", + "gas_class_group_task_id = #{gasClassGroupTaskId,jdbcType=BIGINT},", + "gas_staff_id = #{gasStaffId,jdbcType=BIGINT},", + "gas_staff_name = #{gasStaffName,jdbcType=VARCHAR},", + "gas_salesman_id = #{gasSalesmanId,jdbcType=BIGINT},", + "gas_salesman_name = #{gasSalesmanName,jdbcType=VARCHAR},", + "gas_agent_id = #{gasAgentId,jdbcType=BIGINT},", + "gas_agent_name = #{gasAgentName,jdbcType=VARCHAR},", + "gas_org_id = #{gasOrgId,jdbcType=BIGINT},", + "gas_org_name = #{gasOrgName,jdbcType=VARCHAR},", + "`status` = #{status,jdbcType=INTEGER},", + "create_time = #{createTime,jdbcType=TIMESTAMP},", + "pay_time = #{payTime,jdbcType=TIMESTAMP},", + "finish_time = #{finishTime,jdbcType=TIMESTAMP},", + "refund_time = #{refundTime,jdbcType=TIMESTAMP},", + "refund_remarks = #{refundRemarks,jdbcType=VARCHAR},", + "ext_1 = #{ext1,jdbcType=VARCHAR},", + "ext_2 = #{ext2,jdbcType=VARCHAR},", + "ext_3 = #{ext3,jdbcType=VARCHAR},", + "ext_4 = #{ext4,jdbcType=VARCHAR},", + "ext_5 = #{ext5,jdbcType=VARCHAR},", + "ext_6 = #{ext6,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=BIGINT}" + }) + int updateByPrimaryKey(HighGasOrder record); +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighGasOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighGasOrderMapperExt.java new file mode 100644 index 00000000..5e2bf944 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasOrderMapperExt.java @@ -0,0 +1,7 @@ +package com.hai.dao; + +/** + * mapper扩展类 + */ +public interface HighGasOrderMapperExt { +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighGasOrderSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighGasOrderSqlProvider.java new file mode 100644 index 00000000..75ea3f89 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasOrderSqlProvider.java @@ -0,0 +1,864 @@ +package com.hai.dao; + +import com.hai.entity.HighGasOrder; +import com.hai.entity.HighGasOrderExample.Criteria; +import com.hai.entity.HighGasOrderExample.Criterion; +import com.hai.entity.HighGasOrderExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class HighGasOrderSqlProvider { + + public String countByExample(HighGasOrderExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("high_gas_order"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(HighGasOrderExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("high_gas_order"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(HighGasOrder record) { + SQL sql = new SQL(); + sql.INSERT_INTO("high_gas_order"); + + if (record.getOrderNo() != null) { + sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); + } + + if (record.getChildOrderNo() != null) { + sql.VALUES("child_order_no", "#{childOrderNo,jdbcType=VARCHAR}"); + } + + if (record.getChannelType() != null) { + sql.VALUES("channel_type", "#{channelType,jdbcType=INTEGER}"); + } + + if (record.getChannelOrderNo() != null) { + sql.VALUES("channel_order_no", "#{channelOrderNo,jdbcType=VARCHAR}"); + } + + if (record.getMemId() != null) { + sql.VALUES("mem_id", "#{memId,jdbcType=BIGINT}"); + } + + if (record.getMemPhone() != null) { + sql.VALUES("mem_phone", "#{memPhone,jdbcType=VARCHAR}"); + } + + if (record.getMerId() != null) { + sql.VALUES("mer_id", "#{merId,jdbcType=BIGINT}"); + } + + if (record.getMerName() != null) { + sql.VALUES("mer_name", "#{merName,jdbcType=VARCHAR}"); + } + + if (record.getStoreId() != null) { + sql.VALUES("store_id", "#{storeId,jdbcType=BIGINT}"); + } + + if (record.getStoreName() != null) { + sql.VALUES("store_name", "#{storeName,jdbcType=VARCHAR}"); + } + + if (record.getGasRefuelPrice() != null) { + sql.VALUES("gas_refuel_price", "#{gasRefuelPrice,jdbcType=DECIMAL}"); + } + + if (record.getGasOilNo() != null) { + sql.VALUES("gas_oil_no", "#{gasOilNo,jdbcType=VARCHAR}"); + } + + if (record.getGasGunNo() != null) { + sql.VALUES("gas_gun_no", "#{gasGunNo,jdbcType=VARCHAR}"); + } + + if (record.getGasOilType() != null) { + sql.VALUES("gas_oil_type", "#{gasOilType,jdbcType=INTEGER}"); + } + + if (record.getGasPricePlatform() != null) { + sql.VALUES("gas_price_platform", "#{gasPricePlatform,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceGun() != null) { + sql.VALUES("gas_price_gun", "#{gasPriceGun,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceVip() != null) { + sql.VALUES("gas_price_vip", "#{gasPriceVip,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceOfficial() != null) { + sql.VALUES("gas_price_official", "#{gasPriceOfficial,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceCost() != null) { + sql.VALUES("gas_price_cost", "#{gasPriceCost,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceCostTotal() != null) { + sql.VALUES("gas_price_cost_total", "#{gasPriceCostTotal,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceChannelPay() != null) { + sql.VALUES("gas_price_channel_pay", "#{gasPriceChannelPay,jdbcType=DECIMAL}"); + } + + if (record.getGasOilLiters() != null) { + sql.VALUES("gas_oil_liters", "#{gasOilLiters,jdbcType=DECIMAL}"); + } + + if (record.getGasDiscount() != null) { + sql.VALUES("gas_discount", "#{gasDiscount,jdbcType=DECIMAL}"); + } + + if (record.getGasOilSubsidy() != null) { + sql.VALUES("gas_oil_subsidy", "#{gasOilSubsidy,jdbcType=DECIMAL}"); + } + + if (record.getGasLitersPreferences() != null) { + sql.VALUES("gas_liters_preferences", "#{gasLitersPreferences,jdbcType=DECIMAL}"); + } + + if (record.getGasPricePreferences() != null) { + sql.VALUES("gas_price_preferences", "#{gasPricePreferences,jdbcType=DECIMAL}"); + } + + if (record.getGasClassGroupId() != null) { + sql.VALUES("gas_class_group_id", "#{gasClassGroupId,jdbcType=BIGINT}"); + } + + if (record.getGasClassGroupName() != null) { + sql.VALUES("gas_class_group_name", "#{gasClassGroupName,jdbcType=VARCHAR}"); + } + + if (record.getGasClassGroupTaskId() != null) { + sql.VALUES("gas_class_group_task_id", "#{gasClassGroupTaskId,jdbcType=BIGINT}"); + } + + if (record.getGasStaffId() != null) { + sql.VALUES("gas_staff_id", "#{gasStaffId,jdbcType=BIGINT}"); + } + + if (record.getGasStaffName() != null) { + sql.VALUES("gas_staff_name", "#{gasStaffName,jdbcType=VARCHAR}"); + } + + if (record.getGasSalesmanId() != null) { + sql.VALUES("gas_salesman_id", "#{gasSalesmanId,jdbcType=BIGINT}"); + } + + if (record.getGasSalesmanName() != null) { + sql.VALUES("gas_salesman_name", "#{gasSalesmanName,jdbcType=VARCHAR}"); + } + + if (record.getGasAgentId() != null) { + sql.VALUES("gas_agent_id", "#{gasAgentId,jdbcType=BIGINT}"); + } + + if (record.getGasAgentName() != null) { + sql.VALUES("gas_agent_name", "#{gasAgentName,jdbcType=VARCHAR}"); + } + + if (record.getGasOrgId() != null) { + sql.VALUES("gas_org_id", "#{gasOrgId,jdbcType=BIGINT}"); + } + + if (record.getGasOrgName() != null) { + sql.VALUES("gas_org_name", "#{gasOrgName,jdbcType=VARCHAR}"); + } + + if (record.getStatus() != null) { + sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getPayTime() != null) { + sql.VALUES("pay_time", "#{payTime,jdbcType=TIMESTAMP}"); + } + + if (record.getFinishTime() != null) { + sql.VALUES("finish_time", "#{finishTime,jdbcType=TIMESTAMP}"); + } + + if (record.getRefundTime() != null) { + sql.VALUES("refund_time", "#{refundTime,jdbcType=TIMESTAMP}"); + } + + if (record.getRefundRemarks() != null) { + sql.VALUES("refund_remarks", "#{refundRemarks,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}"); + } + + if (record.getExt4() != null) { + sql.VALUES("ext_4", "#{ext4,jdbcType=VARCHAR}"); + } + + if (record.getExt5() != null) { + sql.VALUES("ext_5", "#{ext5,jdbcType=VARCHAR}"); + } + + if (record.getExt6() != null) { + sql.VALUES("ext_6", "#{ext6,jdbcType=VARCHAR}"); + } + + return sql.toString(); + } + + public String selectByExample(HighGasOrderExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("order_no"); + sql.SELECT("child_order_no"); + sql.SELECT("channel_type"); + sql.SELECT("channel_order_no"); + sql.SELECT("mem_id"); + sql.SELECT("mem_phone"); + sql.SELECT("mer_id"); + sql.SELECT("mer_name"); + sql.SELECT("store_id"); + sql.SELECT("store_name"); + sql.SELECT("gas_refuel_price"); + sql.SELECT("gas_oil_no"); + sql.SELECT("gas_gun_no"); + sql.SELECT("gas_oil_type"); + sql.SELECT("gas_price_platform"); + sql.SELECT("gas_price_gun"); + sql.SELECT("gas_price_vip"); + sql.SELECT("gas_price_official"); + sql.SELECT("gas_price_cost"); + sql.SELECT("gas_price_cost_total"); + sql.SELECT("gas_price_channel_pay"); + sql.SELECT("gas_oil_liters"); + sql.SELECT("gas_discount"); + sql.SELECT("gas_oil_subsidy"); + sql.SELECT("gas_liters_preferences"); + sql.SELECT("gas_price_preferences"); + sql.SELECT("gas_class_group_id"); + sql.SELECT("gas_class_group_name"); + sql.SELECT("gas_class_group_task_id"); + sql.SELECT("gas_staff_id"); + sql.SELECT("gas_staff_name"); + sql.SELECT("gas_salesman_id"); + sql.SELECT("gas_salesman_name"); + sql.SELECT("gas_agent_id"); + sql.SELECT("gas_agent_name"); + sql.SELECT("gas_org_id"); + sql.SELECT("gas_org_name"); + sql.SELECT("`status`"); + sql.SELECT("create_time"); + sql.SELECT("pay_time"); + sql.SELECT("finish_time"); + sql.SELECT("refund_time"); + sql.SELECT("refund_remarks"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.SELECT("ext_4"); + sql.SELECT("ext_5"); + sql.SELECT("ext_6"); + sql.FROM("high_gas_order"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + HighGasOrder record = (HighGasOrder) parameter.get("record"); + HighGasOrderExample example = (HighGasOrderExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("high_gas_order"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getOrderNo() != null) { + sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); + } + + if (record.getChildOrderNo() != null) { + sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); + } + + if (record.getChannelType() != null) { + sql.SET("channel_type = #{record.channelType,jdbcType=INTEGER}"); + } + + if (record.getChannelOrderNo() != null) { + sql.SET("channel_order_no = #{record.channelOrderNo,jdbcType=VARCHAR}"); + } + + if (record.getMemId() != null) { + sql.SET("mem_id = #{record.memId,jdbcType=BIGINT}"); + } + + if (record.getMemPhone() != null) { + sql.SET("mem_phone = #{record.memPhone,jdbcType=VARCHAR}"); + } + + if (record.getMerId() != null) { + sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); + } + + if (record.getMerName() != null) { + sql.SET("mer_name = #{record.merName,jdbcType=VARCHAR}"); + } + + if (record.getStoreId() != null) { + sql.SET("store_id = #{record.storeId,jdbcType=BIGINT}"); + } + + if (record.getStoreName() != null) { + sql.SET("store_name = #{record.storeName,jdbcType=VARCHAR}"); + } + + if (record.getGasRefuelPrice() != null) { + sql.SET("gas_refuel_price = #{record.gasRefuelPrice,jdbcType=DECIMAL}"); + } + + if (record.getGasOilNo() != null) { + sql.SET("gas_oil_no = #{record.gasOilNo,jdbcType=VARCHAR}"); + } + + if (record.getGasGunNo() != null) { + sql.SET("gas_gun_no = #{record.gasGunNo,jdbcType=VARCHAR}"); + } + + if (record.getGasOilType() != null) { + sql.SET("gas_oil_type = #{record.gasOilType,jdbcType=INTEGER}"); + } + + if (record.getGasPricePlatform() != null) { + sql.SET("gas_price_platform = #{record.gasPricePlatform,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceGun() != null) { + sql.SET("gas_price_gun = #{record.gasPriceGun,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceVip() != null) { + sql.SET("gas_price_vip = #{record.gasPriceVip,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceOfficial() != null) { + sql.SET("gas_price_official = #{record.gasPriceOfficial,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceCost() != null) { + sql.SET("gas_price_cost = #{record.gasPriceCost,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceCostTotal() != null) { + sql.SET("gas_price_cost_total = #{record.gasPriceCostTotal,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceChannelPay() != null) { + sql.SET("gas_price_channel_pay = #{record.gasPriceChannelPay,jdbcType=DECIMAL}"); + } + + if (record.getGasOilLiters() != null) { + sql.SET("gas_oil_liters = #{record.gasOilLiters,jdbcType=DECIMAL}"); + } + + if (record.getGasDiscount() != null) { + sql.SET("gas_discount = #{record.gasDiscount,jdbcType=DECIMAL}"); + } + + if (record.getGasOilSubsidy() != null) { + sql.SET("gas_oil_subsidy = #{record.gasOilSubsidy,jdbcType=DECIMAL}"); + } + + if (record.getGasLitersPreferences() != null) { + sql.SET("gas_liters_preferences = #{record.gasLitersPreferences,jdbcType=DECIMAL}"); + } + + if (record.getGasPricePreferences() != null) { + sql.SET("gas_price_preferences = #{record.gasPricePreferences,jdbcType=DECIMAL}"); + } + + if (record.getGasClassGroupId() != null) { + sql.SET("gas_class_group_id = #{record.gasClassGroupId,jdbcType=BIGINT}"); + } + + if (record.getGasClassGroupName() != null) { + sql.SET("gas_class_group_name = #{record.gasClassGroupName,jdbcType=VARCHAR}"); + } + + if (record.getGasClassGroupTaskId() != null) { + sql.SET("gas_class_group_task_id = #{record.gasClassGroupTaskId,jdbcType=BIGINT}"); + } + + if (record.getGasStaffId() != null) { + sql.SET("gas_staff_id = #{record.gasStaffId,jdbcType=BIGINT}"); + } + + if (record.getGasStaffName() != null) { + sql.SET("gas_staff_name = #{record.gasStaffName,jdbcType=VARCHAR}"); + } + + if (record.getGasSalesmanId() != null) { + sql.SET("gas_salesman_id = #{record.gasSalesmanId,jdbcType=BIGINT}"); + } + + if (record.getGasSalesmanName() != null) { + sql.SET("gas_salesman_name = #{record.gasSalesmanName,jdbcType=VARCHAR}"); + } + + if (record.getGasAgentId() != null) { + sql.SET("gas_agent_id = #{record.gasAgentId,jdbcType=BIGINT}"); + } + + if (record.getGasAgentName() != null) { + sql.SET("gas_agent_name = #{record.gasAgentName,jdbcType=VARCHAR}"); + } + + if (record.getGasOrgId() != null) { + sql.SET("gas_org_id = #{record.gasOrgId,jdbcType=BIGINT}"); + } + + if (record.getGasOrgName() != null) { + sql.SET("gas_org_name = #{record.gasOrgName,jdbcType=VARCHAR}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getPayTime() != null) { + sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); + } + + if (record.getFinishTime() != null) { + sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}"); + } + + if (record.getRefundTime() != null) { + sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}"); + } + + if (record.getRefundRemarks() != null) { + sql.SET("refund_remarks = #{record.refundRemarks,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}"); + } + + if (record.getExt4() != null) { + sql.SET("ext_4 = #{record.ext4,jdbcType=VARCHAR}"); + } + + if (record.getExt5() != null) { + sql.SET("ext_5 = #{record.ext5,jdbcType=VARCHAR}"); + } + + if (record.getExt6() != null) { + sql.SET("ext_6 = #{record.ext6,jdbcType=VARCHAR}"); + } + + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByExample(Map parameter) { + SQL sql = new SQL(); + sql.UPDATE("high_gas_order"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); + sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); + sql.SET("channel_type = #{record.channelType,jdbcType=INTEGER}"); + sql.SET("channel_order_no = #{record.channelOrderNo,jdbcType=VARCHAR}"); + sql.SET("mem_id = #{record.memId,jdbcType=BIGINT}"); + sql.SET("mem_phone = #{record.memPhone,jdbcType=VARCHAR}"); + sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); + sql.SET("mer_name = #{record.merName,jdbcType=VARCHAR}"); + sql.SET("store_id = #{record.storeId,jdbcType=BIGINT}"); + sql.SET("store_name = #{record.storeName,jdbcType=VARCHAR}"); + sql.SET("gas_refuel_price = #{record.gasRefuelPrice,jdbcType=DECIMAL}"); + sql.SET("gas_oil_no = #{record.gasOilNo,jdbcType=VARCHAR}"); + sql.SET("gas_gun_no = #{record.gasGunNo,jdbcType=VARCHAR}"); + sql.SET("gas_oil_type = #{record.gasOilType,jdbcType=INTEGER}"); + sql.SET("gas_price_platform = #{record.gasPricePlatform,jdbcType=DECIMAL}"); + sql.SET("gas_price_gun = #{record.gasPriceGun,jdbcType=DECIMAL}"); + sql.SET("gas_price_vip = #{record.gasPriceVip,jdbcType=DECIMAL}"); + sql.SET("gas_price_official = #{record.gasPriceOfficial,jdbcType=DECIMAL}"); + sql.SET("gas_price_cost = #{record.gasPriceCost,jdbcType=DECIMAL}"); + sql.SET("gas_price_cost_total = #{record.gasPriceCostTotal,jdbcType=DECIMAL}"); + sql.SET("gas_price_channel_pay = #{record.gasPriceChannelPay,jdbcType=DECIMAL}"); + sql.SET("gas_oil_liters = #{record.gasOilLiters,jdbcType=DECIMAL}"); + sql.SET("gas_discount = #{record.gasDiscount,jdbcType=DECIMAL}"); + sql.SET("gas_oil_subsidy = #{record.gasOilSubsidy,jdbcType=DECIMAL}"); + sql.SET("gas_liters_preferences = #{record.gasLitersPreferences,jdbcType=DECIMAL}"); + sql.SET("gas_price_preferences = #{record.gasPricePreferences,jdbcType=DECIMAL}"); + sql.SET("gas_class_group_id = #{record.gasClassGroupId,jdbcType=BIGINT}"); + sql.SET("gas_class_group_name = #{record.gasClassGroupName,jdbcType=VARCHAR}"); + sql.SET("gas_class_group_task_id = #{record.gasClassGroupTaskId,jdbcType=BIGINT}"); + sql.SET("gas_staff_id = #{record.gasStaffId,jdbcType=BIGINT}"); + sql.SET("gas_staff_name = #{record.gasStaffName,jdbcType=VARCHAR}"); + sql.SET("gas_salesman_id = #{record.gasSalesmanId,jdbcType=BIGINT}"); + sql.SET("gas_salesman_name = #{record.gasSalesmanName,jdbcType=VARCHAR}"); + sql.SET("gas_agent_id = #{record.gasAgentId,jdbcType=BIGINT}"); + sql.SET("gas_agent_name = #{record.gasAgentName,jdbcType=VARCHAR}"); + sql.SET("gas_org_id = #{record.gasOrgId,jdbcType=BIGINT}"); + sql.SET("gas_org_name = #{record.gasOrgName,jdbcType=VARCHAR}"); + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); + sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}"); + sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}"); + sql.SET("refund_remarks = #{record.refundRemarks,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}"); + sql.SET("ext_4 = #{record.ext4,jdbcType=VARCHAR}"); + sql.SET("ext_5 = #{record.ext5,jdbcType=VARCHAR}"); + sql.SET("ext_6 = #{record.ext6,jdbcType=VARCHAR}"); + + HighGasOrderExample example = (HighGasOrderExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(HighGasOrder record) { + SQL sql = new SQL(); + sql.UPDATE("high_gas_order"); + + if (record.getOrderNo() != null) { + sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}"); + } + + if (record.getChildOrderNo() != null) { + sql.SET("child_order_no = #{childOrderNo,jdbcType=VARCHAR}"); + } + + if (record.getChannelType() != null) { + sql.SET("channel_type = #{channelType,jdbcType=INTEGER}"); + } + + if (record.getChannelOrderNo() != null) { + sql.SET("channel_order_no = #{channelOrderNo,jdbcType=VARCHAR}"); + } + + if (record.getMemId() != null) { + sql.SET("mem_id = #{memId,jdbcType=BIGINT}"); + } + + if (record.getMemPhone() != null) { + sql.SET("mem_phone = #{memPhone,jdbcType=VARCHAR}"); + } + + if (record.getMerId() != null) { + sql.SET("mer_id = #{merId,jdbcType=BIGINT}"); + } + + if (record.getMerName() != null) { + sql.SET("mer_name = #{merName,jdbcType=VARCHAR}"); + } + + if (record.getStoreId() != null) { + sql.SET("store_id = #{storeId,jdbcType=BIGINT}"); + } + + if (record.getStoreName() != null) { + sql.SET("store_name = #{storeName,jdbcType=VARCHAR}"); + } + + if (record.getGasRefuelPrice() != null) { + sql.SET("gas_refuel_price = #{gasRefuelPrice,jdbcType=DECIMAL}"); + } + + if (record.getGasOilNo() != null) { + sql.SET("gas_oil_no = #{gasOilNo,jdbcType=VARCHAR}"); + } + + if (record.getGasGunNo() != null) { + sql.SET("gas_gun_no = #{gasGunNo,jdbcType=VARCHAR}"); + } + + if (record.getGasOilType() != null) { + sql.SET("gas_oil_type = #{gasOilType,jdbcType=INTEGER}"); + } + + if (record.getGasPricePlatform() != null) { + sql.SET("gas_price_platform = #{gasPricePlatform,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceGun() != null) { + sql.SET("gas_price_gun = #{gasPriceGun,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceVip() != null) { + sql.SET("gas_price_vip = #{gasPriceVip,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceOfficial() != null) { + sql.SET("gas_price_official = #{gasPriceOfficial,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceCost() != null) { + sql.SET("gas_price_cost = #{gasPriceCost,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceCostTotal() != null) { + sql.SET("gas_price_cost_total = #{gasPriceCostTotal,jdbcType=DECIMAL}"); + } + + if (record.getGasPriceChannelPay() != null) { + sql.SET("gas_price_channel_pay = #{gasPriceChannelPay,jdbcType=DECIMAL}"); + } + + if (record.getGasOilLiters() != null) { + sql.SET("gas_oil_liters = #{gasOilLiters,jdbcType=DECIMAL}"); + } + + if (record.getGasDiscount() != null) { + sql.SET("gas_discount = #{gasDiscount,jdbcType=DECIMAL}"); + } + + if (record.getGasOilSubsidy() != null) { + sql.SET("gas_oil_subsidy = #{gasOilSubsidy,jdbcType=DECIMAL}"); + } + + if (record.getGasLitersPreferences() != null) { + sql.SET("gas_liters_preferences = #{gasLitersPreferences,jdbcType=DECIMAL}"); + } + + if (record.getGasPricePreferences() != null) { + sql.SET("gas_price_preferences = #{gasPricePreferences,jdbcType=DECIMAL}"); + } + + if (record.getGasClassGroupId() != null) { + sql.SET("gas_class_group_id = #{gasClassGroupId,jdbcType=BIGINT}"); + } + + if (record.getGasClassGroupName() != null) { + sql.SET("gas_class_group_name = #{gasClassGroupName,jdbcType=VARCHAR}"); + } + + if (record.getGasClassGroupTaskId() != null) { + sql.SET("gas_class_group_task_id = #{gasClassGroupTaskId,jdbcType=BIGINT}"); + } + + if (record.getGasStaffId() != null) { + sql.SET("gas_staff_id = #{gasStaffId,jdbcType=BIGINT}"); + } + + if (record.getGasStaffName() != null) { + sql.SET("gas_staff_name = #{gasStaffName,jdbcType=VARCHAR}"); + } + + if (record.getGasSalesmanId() != null) { + sql.SET("gas_salesman_id = #{gasSalesmanId,jdbcType=BIGINT}"); + } + + if (record.getGasSalesmanName() != null) { + sql.SET("gas_salesman_name = #{gasSalesmanName,jdbcType=VARCHAR}"); + } + + if (record.getGasAgentId() != null) { + sql.SET("gas_agent_id = #{gasAgentId,jdbcType=BIGINT}"); + } + + if (record.getGasAgentName() != null) { + sql.SET("gas_agent_name = #{gasAgentName,jdbcType=VARCHAR}"); + } + + if (record.getGasOrgId() != null) { + sql.SET("gas_org_id = #{gasOrgId,jdbcType=BIGINT}"); + } + + if (record.getGasOrgName() != null) { + sql.SET("gas_org_name = #{gasOrgName,jdbcType=VARCHAR}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getPayTime() != null) { + sql.SET("pay_time = #{payTime,jdbcType=TIMESTAMP}"); + } + + if (record.getFinishTime() != null) { + sql.SET("finish_time = #{finishTime,jdbcType=TIMESTAMP}"); + } + + if (record.getRefundTime() != null) { + sql.SET("refund_time = #{refundTime,jdbcType=TIMESTAMP}"); + } + + if (record.getRefundRemarks() != null) { + sql.SET("refund_remarks = #{refundRemarks,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}"); + } + + if (record.getExt4() != null) { + sql.SET("ext_4 = #{ext4,jdbcType=VARCHAR}"); + } + + if (record.getExt5() != null) { + sql.SET("ext_5 = #{ext5,jdbcType=VARCHAR}"); + } + + if (record.getExt6() != null) { + sql.SET("ext_6 = #{ext6,jdbcType=VARCHAR}"); + } + + sql.WHERE("id = #{id,jdbcType=BIGINT}"); + + return sql.toString(); + } + + protected void applyWhere(SQL sql, HighGasOrderExample 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/HighGasOrder.java b/hai-service/src/main/java/com/hai/entity/HighGasOrder.java new file mode 100644 index 00000000..263f027f --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighGasOrder.java @@ -0,0 +1,838 @@ +package com.hai.entity; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * high_gas_order + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class HighGasOrder implements Serializable { + /** + * 主键ID + */ + private Long id; + + /** + * 交易订单号 + */ + private String orderNo; + + /** + * 子订单号 + */ + private String childOrderNo; + + /** + * 渠道类型 + */ + private Integer channelType; + + /** + * 渠道订单号 + */ + private String channelOrderNo; + + /** + * 用户id + */ + private Long memId; + + /** + * 用户手机号 + */ + private String memPhone; + + /** + * 商户id + */ + private Long merId; + + /** + * 商户名称 + */ + private String merName; + + /** + * 门店id + */ + private Long storeId; + + /** + * 门店名称 + */ + private String storeName; + + /** + * 【加油站】加油金额 + */ + private BigDecimal gasRefuelPrice; + + /** + * 【加油站】油号 + */ + private String gasOilNo; + + /** + * 【加油站】油抢号 + */ + private String gasGunNo; + + /** + * 【加油站】油品类型 1:汽油:2:柴油;3:天然气 + */ + private Integer gasOilType; + + /** + * 【加油站】平台价 + */ + private BigDecimal gasPricePlatform; + + /** + * 【加油站】油枪价 + */ + private BigDecimal gasPriceGun; + + /** + * 【加油站】优惠价 + */ + private BigDecimal gasPriceVip; + + /** + * 【加油站】国标价 + */ + private BigDecimal gasPriceOfficial; + + /** + * 【加油站】成本单价 + */ + private BigDecimal gasPriceCost; + + /** + * 【加油站】成本总价 + */ + private BigDecimal gasPriceCostTotal; + + /** + * 【加油站】渠道支付金额 + */ + private BigDecimal gasPriceChannelPay; + + /** + * 【加油站】加油升数 + */ + private BigDecimal gasOilLiters; + + /** + * 【加油站】加油折扣 + */ + private BigDecimal gasDiscount; + + /** + * 【加油站】加油补贴 + */ + private BigDecimal gasOilSubsidy; + + /** + * 【加油站】每升优惠 + */ + private BigDecimal gasLitersPreferences; + + /** + * 【加油站】优惠价格 + */ + private BigDecimal gasPricePreferences; + + /** + * 【加油站】班组id + */ + private Long gasClassGroupId; + + /** + * 【加油站】班组名称 + */ + private String gasClassGroupName; + + /** + * 【加油站】班组任务id + */ + private Long gasClassGroupTaskId; + + /** + * 【加油站】加油员id + */ + private Long gasStaffId; + + /** + * 【加油站】加油员名称 + */ + private String gasStaffName; + + /** + * 【加油站】业务员id + */ + private Long gasSalesmanId; + + /** + * 【加油站】业务员名称 + */ + private String gasSalesmanName; + + /** + * 【加油站】代理商id + */ + private Long gasAgentId; + + /** + * 【加油站】代理商名称 + */ + private String gasAgentName; + + /** + * 【加油站】代理公司id + */ + private Long gasOrgId; + + /** + * 【加油站】代理公司名称 + */ + private String gasOrgName; + + /** + * 订单状态： +1. 待支付 +2. 已支付 +3. 已取消 +4. 已退款 +5. 退款中 +6. 退款失败 + */ + private Integer status; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 支付时间 + */ + private Date payTime; + + /** + * 完成时间 + */ + private Date finishTime; + + /** + * 退款时间 + */ + private Date refundTime; + + /** + * 退款备注 + */ + private String refundRemarks; + + private String ext1; + + private String ext2; + + private String ext3; + + private String ext4; + + private String ext5; + + private String ext6; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getChildOrderNo() { + return childOrderNo; + } + + public void setChildOrderNo(String childOrderNo) { + this.childOrderNo = childOrderNo; + } + + public Integer getChannelType() { + return channelType; + } + + public void setChannelType(Integer channelType) { + this.channelType = channelType; + } + + public String getChannelOrderNo() { + return channelOrderNo; + } + + public void setChannelOrderNo(String channelOrderNo) { + this.channelOrderNo = channelOrderNo; + } + + public Long getMemId() { + return memId; + } + + public void setMemId(Long memId) { + this.memId = memId; + } + + public String getMemPhone() { + return memPhone; + } + + public void setMemPhone(String memPhone) { + this.memPhone = memPhone; + } + + public Long getMerId() { + return merId; + } + + public void setMerId(Long merId) { + this.merId = merId; + } + + public String getMerName() { + return merName; + } + + public void setMerName(String merName) { + this.merName = merName; + } + + public Long getStoreId() { + return storeId; + } + + public void setStoreId(Long storeId) { + this.storeId = storeId; + } + + public String getStoreName() { + return storeName; + } + + public void setStoreName(String storeName) { + this.storeName = storeName; + } + + public BigDecimal getGasRefuelPrice() { + return gasRefuelPrice; + } + + public void setGasRefuelPrice(BigDecimal gasRefuelPrice) { + this.gasRefuelPrice = gasRefuelPrice; + } + + public String getGasOilNo() { + return gasOilNo; + } + + public void setGasOilNo(String gasOilNo) { + this.gasOilNo = gasOilNo; + } + + public String getGasGunNo() { + return gasGunNo; + } + + public void setGasGunNo(String gasGunNo) { + this.gasGunNo = gasGunNo; + } + + public Integer getGasOilType() { + return gasOilType; + } + + public void setGasOilType(Integer gasOilType) { + this.gasOilType = gasOilType; + } + + public BigDecimal getGasPricePlatform() { + return gasPricePlatform; + } + + public void setGasPricePlatform(BigDecimal gasPricePlatform) { + this.gasPricePlatform = gasPricePlatform; + } + + public BigDecimal getGasPriceGun() { + return gasPriceGun; + } + + public void setGasPriceGun(BigDecimal gasPriceGun) { + this.gasPriceGun = gasPriceGun; + } + + public BigDecimal getGasPriceVip() { + return gasPriceVip; + } + + public void setGasPriceVip(BigDecimal gasPriceVip) { + this.gasPriceVip = gasPriceVip; + } + + public BigDecimal getGasPriceOfficial() { + return gasPriceOfficial; + } + + public void setGasPriceOfficial(BigDecimal gasPriceOfficial) { + this.gasPriceOfficial = gasPriceOfficial; + } + + public BigDecimal getGasPriceCost() { + return gasPriceCost; + } + + public void setGasPriceCost(BigDecimal gasPriceCost) { + this.gasPriceCost = gasPriceCost; + } + + public BigDecimal getGasPriceCostTotal() { + return gasPriceCostTotal; + } + + public void setGasPriceCostTotal(BigDecimal gasPriceCostTotal) { + this.gasPriceCostTotal = gasPriceCostTotal; + } + + public BigDecimal getGasPriceChannelPay() { + return gasPriceChannelPay; + } + + public void setGasPriceChannelPay(BigDecimal gasPriceChannelPay) { + this.gasPriceChannelPay = gasPriceChannelPay; + } + + public BigDecimal getGasOilLiters() { + return gasOilLiters; + } + + public void setGasOilLiters(BigDecimal gasOilLiters) { + this.gasOilLiters = gasOilLiters; + } + + public BigDecimal getGasDiscount() { + return gasDiscount; + } + + public void setGasDiscount(BigDecimal gasDiscount) { + this.gasDiscount = gasDiscount; + } + + public BigDecimal getGasOilSubsidy() { + return gasOilSubsidy; + } + + public void setGasOilSubsidy(BigDecimal gasOilSubsidy) { + this.gasOilSubsidy = gasOilSubsidy; + } + + public BigDecimal getGasLitersPreferences() { + return gasLitersPreferences; + } + + public void setGasLitersPreferences(BigDecimal gasLitersPreferences) { + this.gasLitersPreferences = gasLitersPreferences; + } + + public BigDecimal getGasPricePreferences() { + return gasPricePreferences; + } + + public void setGasPricePreferences(BigDecimal gasPricePreferences) { + this.gasPricePreferences = gasPricePreferences; + } + + public Long getGasClassGroupId() { + return gasClassGroupId; + } + + public void setGasClassGroupId(Long gasClassGroupId) { + this.gasClassGroupId = gasClassGroupId; + } + + public String getGasClassGroupName() { + return gasClassGroupName; + } + + public void setGasClassGroupName(String gasClassGroupName) { + this.gasClassGroupName = gasClassGroupName; + } + + public Long getGasClassGroupTaskId() { + return gasClassGroupTaskId; + } + + public void setGasClassGroupTaskId(Long gasClassGroupTaskId) { + this.gasClassGroupTaskId = gasClassGroupTaskId; + } + + public Long getGasStaffId() { + return gasStaffId; + } + + public void setGasStaffId(Long gasStaffId) { + this.gasStaffId = gasStaffId; + } + + public String getGasStaffName() { + return gasStaffName; + } + + public void setGasStaffName(String gasStaffName) { + this.gasStaffName = gasStaffName; + } + + public Long getGasSalesmanId() { + return gasSalesmanId; + } + + public void setGasSalesmanId(Long gasSalesmanId) { + this.gasSalesmanId = gasSalesmanId; + } + + public String getGasSalesmanName() { + return gasSalesmanName; + } + + public void setGasSalesmanName(String gasSalesmanName) { + this.gasSalesmanName = gasSalesmanName; + } + + public Long getGasAgentId() { + return gasAgentId; + } + + public void setGasAgentId(Long gasAgentId) { + this.gasAgentId = gasAgentId; + } + + public String getGasAgentName() { + return gasAgentName; + } + + public void setGasAgentName(String gasAgentName) { + this.gasAgentName = gasAgentName; + } + + public Long getGasOrgId() { + return gasOrgId; + } + + public void setGasOrgId(Long gasOrgId) { + this.gasOrgId = gasOrgId; + } + + public String getGasOrgName() { + return gasOrgName; + } + + public void setGasOrgName(String gasOrgName) { + this.gasOrgName = gasOrgName; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getPayTime() { + return payTime; + } + + public void setPayTime(Date payTime) { + this.payTime = payTime; + } + + public Date getFinishTime() { + return finishTime; + } + + public void setFinishTime(Date finishTime) { + this.finishTime = finishTime; + } + + public Date getRefundTime() { + return refundTime; + } + + public void setRefundTime(Date refundTime) { + this.refundTime = refundTime; + } + + public String getRefundRemarks() { + return refundRemarks; + } + + public void setRefundRemarks(String refundRemarks) { + this.refundRemarks = refundRemarks; + } + + 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; + } + + public String getExt4() { + return ext4; + } + + public void setExt4(String ext4) { + this.ext4 = ext4; + } + + public String getExt5() { + return ext5; + } + + public void setExt5(String ext5) { + this.ext5 = ext5; + } + + public String getExt6() { + return ext6; + } + + public void setExt6(String ext6) { + this.ext6 = ext6; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + HighGasOrder other = (HighGasOrder) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) + && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo())) + && (this.getChannelType() == null ? other.getChannelType() == null : this.getChannelType().equals(other.getChannelType())) + && (this.getChannelOrderNo() == null ? other.getChannelOrderNo() == null : this.getChannelOrderNo().equals(other.getChannelOrderNo())) + && (this.getMemId() == null ? other.getMemId() == null : this.getMemId().equals(other.getMemId())) + && (this.getMemPhone() == null ? other.getMemPhone() == null : this.getMemPhone().equals(other.getMemPhone())) + && (this.getMerId() == null ? other.getMerId() == null : this.getMerId().equals(other.getMerId())) + && (this.getMerName() == null ? other.getMerName() == null : this.getMerName().equals(other.getMerName())) + && (this.getStoreId() == null ? other.getStoreId() == null : this.getStoreId().equals(other.getStoreId())) + && (this.getStoreName() == null ? other.getStoreName() == null : this.getStoreName().equals(other.getStoreName())) + && (this.getGasRefuelPrice() == null ? other.getGasRefuelPrice() == null : this.getGasRefuelPrice().equals(other.getGasRefuelPrice())) + && (this.getGasOilNo() == null ? other.getGasOilNo() == null : this.getGasOilNo().equals(other.getGasOilNo())) + && (this.getGasGunNo() == null ? other.getGasGunNo() == null : this.getGasGunNo().equals(other.getGasGunNo())) + && (this.getGasOilType() == null ? other.getGasOilType() == null : this.getGasOilType().equals(other.getGasOilType())) + && (this.getGasPricePlatform() == null ? other.getGasPricePlatform() == null : this.getGasPricePlatform().equals(other.getGasPricePlatform())) + && (this.getGasPriceGun() == null ? other.getGasPriceGun() == null : this.getGasPriceGun().equals(other.getGasPriceGun())) + && (this.getGasPriceVip() == null ? other.getGasPriceVip() == null : this.getGasPriceVip().equals(other.getGasPriceVip())) + && (this.getGasPriceOfficial() == null ? other.getGasPriceOfficial() == null : this.getGasPriceOfficial().equals(other.getGasPriceOfficial())) + && (this.getGasPriceCost() == null ? other.getGasPriceCost() == null : this.getGasPriceCost().equals(other.getGasPriceCost())) + && (this.getGasPriceCostTotal() == null ? other.getGasPriceCostTotal() == null : this.getGasPriceCostTotal().equals(other.getGasPriceCostTotal())) + && (this.getGasPriceChannelPay() == null ? other.getGasPriceChannelPay() == null : this.getGasPriceChannelPay().equals(other.getGasPriceChannelPay())) + && (this.getGasOilLiters() == null ? other.getGasOilLiters() == null : this.getGasOilLiters().equals(other.getGasOilLiters())) + && (this.getGasDiscount() == null ? other.getGasDiscount() == null : this.getGasDiscount().equals(other.getGasDiscount())) + && (this.getGasOilSubsidy() == null ? other.getGasOilSubsidy() == null : this.getGasOilSubsidy().equals(other.getGasOilSubsidy())) + && (this.getGasLitersPreferences() == null ? other.getGasLitersPreferences() == null : this.getGasLitersPreferences().equals(other.getGasLitersPreferences())) + && (this.getGasPricePreferences() == null ? other.getGasPricePreferences() == null : this.getGasPricePreferences().equals(other.getGasPricePreferences())) + && (this.getGasClassGroupId() == null ? other.getGasClassGroupId() == null : this.getGasClassGroupId().equals(other.getGasClassGroupId())) + && (this.getGasClassGroupName() == null ? other.getGasClassGroupName() == null : this.getGasClassGroupName().equals(other.getGasClassGroupName())) + && (this.getGasClassGroupTaskId() == null ? other.getGasClassGroupTaskId() == null : this.getGasClassGroupTaskId().equals(other.getGasClassGroupTaskId())) + && (this.getGasStaffId() == null ? other.getGasStaffId() == null : this.getGasStaffId().equals(other.getGasStaffId())) + && (this.getGasStaffName() == null ? other.getGasStaffName() == null : this.getGasStaffName().equals(other.getGasStaffName())) + && (this.getGasSalesmanId() == null ? other.getGasSalesmanId() == null : this.getGasSalesmanId().equals(other.getGasSalesmanId())) + && (this.getGasSalesmanName() == null ? other.getGasSalesmanName() == null : this.getGasSalesmanName().equals(other.getGasSalesmanName())) + && (this.getGasAgentId() == null ? other.getGasAgentId() == null : this.getGasAgentId().equals(other.getGasAgentId())) + && (this.getGasAgentName() == null ? other.getGasAgentName() == null : this.getGasAgentName().equals(other.getGasAgentName())) + && (this.getGasOrgId() == null ? other.getGasOrgId() == null : this.getGasOrgId().equals(other.getGasOrgId())) + && (this.getGasOrgName() == null ? other.getGasOrgName() == null : this.getGasOrgName().equals(other.getGasOrgName())) + && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime())) + && (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime())) + && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime())) + && (this.getRefundRemarks() == null ? other.getRefundRemarks() == null : this.getRefundRemarks().equals(other.getRefundRemarks())) + && (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())) + && (this.getExt4() == null ? other.getExt4() == null : this.getExt4().equals(other.getExt4())) + && (this.getExt5() == null ? other.getExt5() == null : this.getExt5().equals(other.getExt5())) + && (this.getExt6() == null ? other.getExt6() == null : this.getExt6().equals(other.getExt6())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); + result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode()); + result = prime * result + ((getChannelType() == null) ? 0 : getChannelType().hashCode()); + result = prime * result + ((getChannelOrderNo() == null) ? 0 : getChannelOrderNo().hashCode()); + result = prime * result + ((getMemId() == null) ? 0 : getMemId().hashCode()); + result = prime * result + ((getMemPhone() == null) ? 0 : getMemPhone().hashCode()); + result = prime * result + ((getMerId() == null) ? 0 : getMerId().hashCode()); + result = prime * result + ((getMerName() == null) ? 0 : getMerName().hashCode()); + result = prime * result + ((getStoreId() == null) ? 0 : getStoreId().hashCode()); + result = prime * result + ((getStoreName() == null) ? 0 : getStoreName().hashCode()); + result = prime * result + ((getGasRefuelPrice() == null) ? 0 : getGasRefuelPrice().hashCode()); + result = prime * result + ((getGasOilNo() == null) ? 0 : getGasOilNo().hashCode()); + result = prime * result + ((getGasGunNo() == null) ? 0 : getGasGunNo().hashCode()); + result = prime * result + ((getGasOilType() == null) ? 0 : getGasOilType().hashCode()); + result = prime * result + ((getGasPricePlatform() == null) ? 0 : getGasPricePlatform().hashCode()); + result = prime * result + ((getGasPriceGun() == null) ? 0 : getGasPriceGun().hashCode()); + result = prime * result + ((getGasPriceVip() == null) ? 0 : getGasPriceVip().hashCode()); + result = prime * result + ((getGasPriceOfficial() == null) ? 0 : getGasPriceOfficial().hashCode()); + result = prime * result + ((getGasPriceCost() == null) ? 0 : getGasPriceCost().hashCode()); + result = prime * result + ((getGasPriceCostTotal() == null) ? 0 : getGasPriceCostTotal().hashCode()); + result = prime * result + ((getGasPriceChannelPay() == null) ? 0 : getGasPriceChannelPay().hashCode()); + result = prime * result + ((getGasOilLiters() == null) ? 0 : getGasOilLiters().hashCode()); + result = prime * result + ((getGasDiscount() == null) ? 0 : getGasDiscount().hashCode()); + result = prime * result + ((getGasOilSubsidy() == null) ? 0 : getGasOilSubsidy().hashCode()); + result = prime * result + ((getGasLitersPreferences() == null) ? 0 : getGasLitersPreferences().hashCode()); + result = prime * result + ((getGasPricePreferences() == null) ? 0 : getGasPricePreferences().hashCode()); + result = prime * result + ((getGasClassGroupId() == null) ? 0 : getGasClassGroupId().hashCode()); + result = prime * result + ((getGasClassGroupName() == null) ? 0 : getGasClassGroupName().hashCode()); + result = prime * result + ((getGasClassGroupTaskId() == null) ? 0 : getGasClassGroupTaskId().hashCode()); + result = prime * result + ((getGasStaffId() == null) ? 0 : getGasStaffId().hashCode()); + result = prime * result + ((getGasStaffName() == null) ? 0 : getGasStaffName().hashCode()); + result = prime * result + ((getGasSalesmanId() == null) ? 0 : getGasSalesmanId().hashCode()); + result = prime * result + ((getGasSalesmanName() == null) ? 0 : getGasSalesmanName().hashCode()); + result = prime * result + ((getGasAgentId() == null) ? 0 : getGasAgentId().hashCode()); + result = prime * result + ((getGasAgentName() == null) ? 0 : getGasAgentName().hashCode()); + result = prime * result + ((getGasOrgId() == null) ? 0 : getGasOrgId().hashCode()); + result = prime * result + ((getGasOrgName() == null) ? 0 : getGasOrgName().hashCode()); + result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode()); + result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().hashCode()); + result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode()); + result = prime * result + ((getRefundRemarks() == null) ? 0 : getRefundRemarks().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()); + result = prime * result + ((getExt4() == null) ? 0 : getExt4().hashCode()); + result = prime * result + ((getExt5() == null) ? 0 : getExt5().hashCode()); + result = prime * result + ((getExt6() == null) ? 0 : getExt6().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(", orderNo=").append(orderNo); + sb.append(", childOrderNo=").append(childOrderNo); + sb.append(", channelType=").append(channelType); + sb.append(", channelOrderNo=").append(channelOrderNo); + sb.append(", memId=").append(memId); + sb.append(", memPhone=").append(memPhone); + sb.append(", merId=").append(merId); + sb.append(", merName=").append(merName); + sb.append(", storeId=").append(storeId); + sb.append(", storeName=").append(storeName); + sb.append(", gasRefuelPrice=").append(gasRefuelPrice); + sb.append(", gasOilNo=").append(gasOilNo); + sb.append(", gasGunNo=").append(gasGunNo); + sb.append(", gasOilType=").append(gasOilType); + sb.append(", gasPricePlatform=").append(gasPricePlatform); + sb.append(", gasPriceGun=").append(gasPriceGun); + sb.append(", gasPriceVip=").append(gasPriceVip); + sb.append(", gasPriceOfficial=").append(gasPriceOfficial); + sb.append(", gasPriceCost=").append(gasPriceCost); + sb.append(", gasPriceCostTotal=").append(gasPriceCostTotal); + sb.append(", gasPriceChannelPay=").append(gasPriceChannelPay); + sb.append(", gasOilLiters=").append(gasOilLiters); + sb.append(", gasDiscount=").append(gasDiscount); + sb.append(", gasOilSubsidy=").append(gasOilSubsidy); + sb.append(", gasLitersPreferences=").append(gasLitersPreferences); + sb.append(", gasPricePreferences=").append(gasPricePreferences); + sb.append(", gasClassGroupId=").append(gasClassGroupId); + sb.append(", gasClassGroupName=").append(gasClassGroupName); + sb.append(", gasClassGroupTaskId=").append(gasClassGroupTaskId); + sb.append(", gasStaffId=").append(gasStaffId); + sb.append(", gasStaffName=").append(gasStaffName); + sb.append(", gasSalesmanId=").append(gasSalesmanId); + sb.append(", gasSalesmanName=").append(gasSalesmanName); + sb.append(", gasAgentId=").append(gasAgentId); + sb.append(", gasAgentName=").append(gasAgentName); + sb.append(", gasOrgId=").append(gasOrgId); + sb.append(", gasOrgName=").append(gasOrgName); + sb.append(", status=").append(status); + sb.append(", createTime=").append(createTime); + sb.append(", payTime=").append(payTime); + sb.append(", finishTime=").append(finishTime); + sb.append(", refundTime=").append(refundTime); + sb.append(", refundRemarks=").append(refundRemarks); + sb.append(", ext1=").append(ext1); + sb.append(", ext2=").append(ext2); + sb.append(", ext3=").append(ext3); + sb.append(", ext4=").append(ext4); + sb.append(", ext5=").append(ext5); + sb.append(", ext6=").append(ext6); + 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/HighGasOrderExample.java b/hai-service/src/main/java/com/hai/entity/HighGasOrderExample.java new file mode 100644 index 00000000..345f525c --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighGasOrderExample.java @@ -0,0 +1,3424 @@ +package com.hai.entity; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class HighGasOrderExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public HighGasOrderExample() { + 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 andOrderNoIsNull() { + addCriterion("order_no is null"); + return (Criteria) this; + } + + public Criteria andOrderNoIsNotNull() { + addCriterion("order_no is not null"); + return (Criteria) this; + } + + public Criteria andOrderNoEqualTo(String value) { + addCriterion("order_no =", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotEqualTo(String value) { + addCriterion("order_no <>", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoGreaterThan(String value) { + addCriterion("order_no >", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("order_no >=", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLessThan(String value) { + addCriterion("order_no <", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLessThanOrEqualTo(String value) { + addCriterion("order_no <=", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLike(String value) { + addCriterion("order_no like", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotLike(String value) { + addCriterion("order_no not like", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoIn(List values) { + addCriterion("order_no in", values, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotIn(List values) { + addCriterion("order_no not in", values, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoBetween(String value1, String value2) { + addCriterion("order_no between", value1, value2, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotBetween(String value1, String value2) { + addCriterion("order_no not between", value1, value2, "orderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoIsNull() { + addCriterion("child_order_no is null"); + return (Criteria) this; + } + + public Criteria andChildOrderNoIsNotNull() { + addCriterion("child_order_no is not null"); + return (Criteria) this; + } + + public Criteria andChildOrderNoEqualTo(String value) { + addCriterion("child_order_no =", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoNotEqualTo(String value) { + addCriterion("child_order_no <>", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoGreaterThan(String value) { + addCriterion("child_order_no >", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("child_order_no >=", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoLessThan(String value) { + addCriterion("child_order_no <", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoLessThanOrEqualTo(String value) { + addCriterion("child_order_no <=", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoLike(String value) { + addCriterion("child_order_no like", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoNotLike(String value) { + addCriterion("child_order_no not like", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoIn(List values) { + addCriterion("child_order_no in", values, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoNotIn(List values) { + addCriterion("child_order_no not in", values, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoBetween(String value1, String value2) { + addCriterion("child_order_no between", value1, value2, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoNotBetween(String value1, String value2) { + addCriterion("child_order_no not between", value1, value2, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChannelTypeIsNull() { + addCriterion("channel_type is null"); + return (Criteria) this; + } + + public Criteria andChannelTypeIsNotNull() { + addCriterion("channel_type is not null"); + return (Criteria) this; + } + + public Criteria andChannelTypeEqualTo(Integer value) { + addCriterion("channel_type =", value, "channelType"); + return (Criteria) this; + } + + public Criteria andChannelTypeNotEqualTo(Integer value) { + addCriterion("channel_type <>", value, "channelType"); + return (Criteria) this; + } + + public Criteria andChannelTypeGreaterThan(Integer value) { + addCriterion("channel_type >", value, "channelType"); + return (Criteria) this; + } + + public Criteria andChannelTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("channel_type >=", value, "channelType"); + return (Criteria) this; + } + + public Criteria andChannelTypeLessThan(Integer value) { + addCriterion("channel_type <", value, "channelType"); + return (Criteria) this; + } + + public Criteria andChannelTypeLessThanOrEqualTo(Integer value) { + addCriterion("channel_type <=", value, "channelType"); + return (Criteria) this; + } + + public Criteria andChannelTypeIn(List values) { + addCriterion("channel_type in", values, "channelType"); + return (Criteria) this; + } + + public Criteria andChannelTypeNotIn(List values) { + addCriterion("channel_type not in", values, "channelType"); + return (Criteria) this; + } + + public Criteria andChannelTypeBetween(Integer value1, Integer value2) { + addCriterion("channel_type between", value1, value2, "channelType"); + return (Criteria) this; + } + + public Criteria andChannelTypeNotBetween(Integer value1, Integer value2) { + addCriterion("channel_type not between", value1, value2, "channelType"); + return (Criteria) this; + } + + public Criteria andChannelOrderNoIsNull() { + addCriterion("channel_order_no is null"); + return (Criteria) this; + } + + public Criteria andChannelOrderNoIsNotNull() { + addCriterion("channel_order_no is not null"); + return (Criteria) this; + } + + public Criteria andChannelOrderNoEqualTo(String value) { + addCriterion("channel_order_no =", value, "channelOrderNo"); + return (Criteria) this; + } + + public Criteria andChannelOrderNoNotEqualTo(String value) { + addCriterion("channel_order_no <>", value, "channelOrderNo"); + return (Criteria) this; + } + + public Criteria andChannelOrderNoGreaterThan(String value) { + addCriterion("channel_order_no >", value, "channelOrderNo"); + return (Criteria) this; + } + + public Criteria andChannelOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("channel_order_no >=", value, "channelOrderNo"); + return (Criteria) this; + } + + public Criteria andChannelOrderNoLessThan(String value) { + addCriterion("channel_order_no <", value, "channelOrderNo"); + return (Criteria) this; + } + + public Criteria andChannelOrderNoLessThanOrEqualTo(String value) { + addCriterion("channel_order_no <=", value, "channelOrderNo"); + return (Criteria) this; + } + + public Criteria andChannelOrderNoLike(String value) { + addCriterion("channel_order_no like", value, "channelOrderNo"); + return (Criteria) this; + } + + public Criteria andChannelOrderNoNotLike(String value) { + addCriterion("channel_order_no not like", value, "channelOrderNo"); + return (Criteria) this; + } + + public Criteria andChannelOrderNoIn(List values) { + addCriterion("channel_order_no in", values, "channelOrderNo"); + return (Criteria) this; + } + + public Criteria andChannelOrderNoNotIn(List values) { + addCriterion("channel_order_no not in", values, "channelOrderNo"); + return (Criteria) this; + } + + public Criteria andChannelOrderNoBetween(String value1, String value2) { + addCriterion("channel_order_no between", value1, value2, "channelOrderNo"); + return (Criteria) this; + } + + public Criteria andChannelOrderNoNotBetween(String value1, String value2) { + addCriterion("channel_order_no not between", value1, value2, "channelOrderNo"); + return (Criteria) this; + } + + public Criteria andMemIdIsNull() { + addCriterion("mem_id is null"); + return (Criteria) this; + } + + public Criteria andMemIdIsNotNull() { + addCriterion("mem_id is not null"); + return (Criteria) this; + } + + public Criteria andMemIdEqualTo(Long value) { + addCriterion("mem_id =", value, "memId"); + return (Criteria) this; + } + + public Criteria andMemIdNotEqualTo(Long value) { + addCriterion("mem_id <>", value, "memId"); + return (Criteria) this; + } + + public Criteria andMemIdGreaterThan(Long value) { + addCriterion("mem_id >", value, "memId"); + return (Criteria) this; + } + + public Criteria andMemIdGreaterThanOrEqualTo(Long value) { + addCriterion("mem_id >=", value, "memId"); + return (Criteria) this; + } + + public Criteria andMemIdLessThan(Long value) { + addCriterion("mem_id <", value, "memId"); + return (Criteria) this; + } + + public Criteria andMemIdLessThanOrEqualTo(Long value) { + addCriterion("mem_id <=", value, "memId"); + return (Criteria) this; + } + + public Criteria andMemIdIn(List values) { + addCriterion("mem_id in", values, "memId"); + return (Criteria) this; + } + + public Criteria andMemIdNotIn(List values) { + addCriterion("mem_id not in", values, "memId"); + return (Criteria) this; + } + + public Criteria andMemIdBetween(Long value1, Long value2) { + addCriterion("mem_id between", value1, value2, "memId"); + return (Criteria) this; + } + + public Criteria andMemIdNotBetween(Long value1, Long value2) { + addCriterion("mem_id not between", value1, value2, "memId"); + return (Criteria) this; + } + + public Criteria andMemPhoneIsNull() { + addCriterion("mem_phone is null"); + return (Criteria) this; + } + + public Criteria andMemPhoneIsNotNull() { + addCriterion("mem_phone is not null"); + return (Criteria) this; + } + + public Criteria andMemPhoneEqualTo(String value) { + addCriterion("mem_phone =", value, "memPhone"); + return (Criteria) this; + } + + public Criteria andMemPhoneNotEqualTo(String value) { + addCriterion("mem_phone <>", value, "memPhone"); + return (Criteria) this; + } + + public Criteria andMemPhoneGreaterThan(String value) { + addCriterion("mem_phone >", value, "memPhone"); + return (Criteria) this; + } + + public Criteria andMemPhoneGreaterThanOrEqualTo(String value) { + addCriterion("mem_phone >=", value, "memPhone"); + return (Criteria) this; + } + + public Criteria andMemPhoneLessThan(String value) { + addCriterion("mem_phone <", value, "memPhone"); + return (Criteria) this; + } + + public Criteria andMemPhoneLessThanOrEqualTo(String value) { + addCriterion("mem_phone <=", value, "memPhone"); + return (Criteria) this; + } + + public Criteria andMemPhoneLike(String value) { + addCriterion("mem_phone like", value, "memPhone"); + return (Criteria) this; + } + + public Criteria andMemPhoneNotLike(String value) { + addCriterion("mem_phone not like", value, "memPhone"); + return (Criteria) this; + } + + public Criteria andMemPhoneIn(List values) { + addCriterion("mem_phone in", values, "memPhone"); + return (Criteria) this; + } + + public Criteria andMemPhoneNotIn(List values) { + addCriterion("mem_phone not in", values, "memPhone"); + return (Criteria) this; + } + + public Criteria andMemPhoneBetween(String value1, String value2) { + addCriterion("mem_phone between", value1, value2, "memPhone"); + return (Criteria) this; + } + + public Criteria andMemPhoneNotBetween(String value1, String value2) { + addCriterion("mem_phone not between", value1, value2, "memPhone"); + return (Criteria) this; + } + + public Criteria andMerIdIsNull() { + addCriterion("mer_id is null"); + return (Criteria) this; + } + + public Criteria andMerIdIsNotNull() { + addCriterion("mer_id is not null"); + return (Criteria) this; + } + + public Criteria andMerIdEqualTo(Long value) { + addCriterion("mer_id =", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotEqualTo(Long value) { + addCriterion("mer_id <>", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdGreaterThan(Long value) { + addCriterion("mer_id >", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdGreaterThanOrEqualTo(Long value) { + addCriterion("mer_id >=", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdLessThan(Long value) { + addCriterion("mer_id <", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdLessThanOrEqualTo(Long value) { + addCriterion("mer_id <=", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdIn(List values) { + addCriterion("mer_id in", values, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotIn(List values) { + addCriterion("mer_id not in", values, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdBetween(Long value1, Long value2) { + addCriterion("mer_id between", value1, value2, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotBetween(Long value1, Long value2) { + addCriterion("mer_id not between", value1, value2, "merId"); + return (Criteria) this; + } + + public Criteria andMerNameIsNull() { + addCriterion("mer_name is null"); + return (Criteria) this; + } + + public Criteria andMerNameIsNotNull() { + addCriterion("mer_name is not null"); + return (Criteria) this; + } + + public Criteria andMerNameEqualTo(String value) { + addCriterion("mer_name =", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameNotEqualTo(String value) { + addCriterion("mer_name <>", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameGreaterThan(String value) { + addCriterion("mer_name >", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameGreaterThanOrEqualTo(String value) { + addCriterion("mer_name >=", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameLessThan(String value) { + addCriterion("mer_name <", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameLessThanOrEqualTo(String value) { + addCriterion("mer_name <=", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameLike(String value) { + addCriterion("mer_name like", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameNotLike(String value) { + addCriterion("mer_name not like", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameIn(List values) { + addCriterion("mer_name in", values, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameNotIn(List values) { + addCriterion("mer_name not in", values, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameBetween(String value1, String value2) { + addCriterion("mer_name between", value1, value2, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameNotBetween(String value1, String value2) { + addCriterion("mer_name not between", value1, value2, "merName"); + return (Criteria) this; + } + + public Criteria andStoreIdIsNull() { + addCriterion("store_id is null"); + return (Criteria) this; + } + + public Criteria andStoreIdIsNotNull() { + addCriterion("store_id is not null"); + return (Criteria) this; + } + + public Criteria andStoreIdEqualTo(Long value) { + addCriterion("store_id =", value, "storeId"); + return (Criteria) this; + } + + public Criteria andStoreIdNotEqualTo(Long value) { + addCriterion("store_id <>", value, "storeId"); + return (Criteria) this; + } + + public Criteria andStoreIdGreaterThan(Long value) { + addCriterion("store_id >", value, "storeId"); + return (Criteria) this; + } + + public Criteria andStoreIdGreaterThanOrEqualTo(Long value) { + addCriterion("store_id >=", value, "storeId"); + return (Criteria) this; + } + + public Criteria andStoreIdLessThan(Long value) { + addCriterion("store_id <", value, "storeId"); + return (Criteria) this; + } + + public Criteria andStoreIdLessThanOrEqualTo(Long value) { + addCriterion("store_id <=", value, "storeId"); + return (Criteria) this; + } + + public Criteria andStoreIdIn(List values) { + addCriterion("store_id in", values, "storeId"); + return (Criteria) this; + } + + public Criteria andStoreIdNotIn(List values) { + addCriterion("store_id not in", values, "storeId"); + return (Criteria) this; + } + + public Criteria andStoreIdBetween(Long value1, Long value2) { + addCriterion("store_id between", value1, value2, "storeId"); + return (Criteria) this; + } + + public Criteria andStoreIdNotBetween(Long value1, Long value2) { + addCriterion("store_id not between", value1, value2, "storeId"); + return (Criteria) this; + } + + public Criteria andStoreNameIsNull() { + addCriterion("store_name is null"); + return (Criteria) this; + } + + public Criteria andStoreNameIsNotNull() { + addCriterion("store_name is not null"); + return (Criteria) this; + } + + public Criteria andStoreNameEqualTo(String value) { + addCriterion("store_name =", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameNotEqualTo(String value) { + addCriterion("store_name <>", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameGreaterThan(String value) { + addCriterion("store_name >", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameGreaterThanOrEqualTo(String value) { + addCriterion("store_name >=", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameLessThan(String value) { + addCriterion("store_name <", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameLessThanOrEqualTo(String value) { + addCriterion("store_name <=", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameLike(String value) { + addCriterion("store_name like", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameNotLike(String value) { + addCriterion("store_name not like", value, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameIn(List values) { + addCriterion("store_name in", values, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameNotIn(List values) { + addCriterion("store_name not in", values, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameBetween(String value1, String value2) { + addCriterion("store_name between", value1, value2, "storeName"); + return (Criteria) this; + } + + public Criteria andStoreNameNotBetween(String value1, String value2) { + addCriterion("store_name not between", value1, value2, "storeName"); + return (Criteria) this; + } + + public Criteria andGasRefuelPriceIsNull() { + addCriterion("gas_refuel_price is null"); + return (Criteria) this; + } + + public Criteria andGasRefuelPriceIsNotNull() { + addCriterion("gas_refuel_price is not null"); + return (Criteria) this; + } + + public Criteria andGasRefuelPriceEqualTo(BigDecimal value) { + addCriterion("gas_refuel_price =", value, "gasRefuelPrice"); + return (Criteria) this; + } + + public Criteria andGasRefuelPriceNotEqualTo(BigDecimal value) { + addCriterion("gas_refuel_price <>", value, "gasRefuelPrice"); + return (Criteria) this; + } + + public Criteria andGasRefuelPriceGreaterThan(BigDecimal value) { + addCriterion("gas_refuel_price >", value, "gasRefuelPrice"); + return (Criteria) this; + } + + public Criteria andGasRefuelPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("gas_refuel_price >=", value, "gasRefuelPrice"); + return (Criteria) this; + } + + public Criteria andGasRefuelPriceLessThan(BigDecimal value) { + addCriterion("gas_refuel_price <", value, "gasRefuelPrice"); + return (Criteria) this; + } + + public Criteria andGasRefuelPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("gas_refuel_price <=", value, "gasRefuelPrice"); + return (Criteria) this; + } + + public Criteria andGasRefuelPriceIn(List values) { + addCriterion("gas_refuel_price in", values, "gasRefuelPrice"); + return (Criteria) this; + } + + public Criteria andGasRefuelPriceNotIn(List values) { + addCriterion("gas_refuel_price not in", values, "gasRefuelPrice"); + return (Criteria) this; + } + + public Criteria andGasRefuelPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_refuel_price between", value1, value2, "gasRefuelPrice"); + return (Criteria) this; + } + + public Criteria andGasRefuelPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_refuel_price not between", value1, value2, "gasRefuelPrice"); + return (Criteria) this; + } + + public Criteria andGasOilNoIsNull() { + addCriterion("gas_oil_no is null"); + return (Criteria) this; + } + + public Criteria andGasOilNoIsNotNull() { + addCriterion("gas_oil_no is not null"); + return (Criteria) this; + } + + public Criteria andGasOilNoEqualTo(String value) { + addCriterion("gas_oil_no =", value, "gasOilNo"); + return (Criteria) this; + } + + public Criteria andGasOilNoNotEqualTo(String value) { + addCriterion("gas_oil_no <>", value, "gasOilNo"); + return (Criteria) this; + } + + public Criteria andGasOilNoGreaterThan(String value) { + addCriterion("gas_oil_no >", value, "gasOilNo"); + return (Criteria) this; + } + + public Criteria andGasOilNoGreaterThanOrEqualTo(String value) { + addCriterion("gas_oil_no >=", value, "gasOilNo"); + return (Criteria) this; + } + + public Criteria andGasOilNoLessThan(String value) { + addCriterion("gas_oil_no <", value, "gasOilNo"); + return (Criteria) this; + } + + public Criteria andGasOilNoLessThanOrEqualTo(String value) { + addCriterion("gas_oil_no <=", value, "gasOilNo"); + return (Criteria) this; + } + + public Criteria andGasOilNoLike(String value) { + addCriterion("gas_oil_no like", value, "gasOilNo"); + return (Criteria) this; + } + + public Criteria andGasOilNoNotLike(String value) { + addCriterion("gas_oil_no not like", value, "gasOilNo"); + return (Criteria) this; + } + + public Criteria andGasOilNoIn(List values) { + addCriterion("gas_oil_no in", values, "gasOilNo"); + return (Criteria) this; + } + + public Criteria andGasOilNoNotIn(List values) { + addCriterion("gas_oil_no not in", values, "gasOilNo"); + return (Criteria) this; + } + + public Criteria andGasOilNoBetween(String value1, String value2) { + addCriterion("gas_oil_no between", value1, value2, "gasOilNo"); + return (Criteria) this; + } + + public Criteria andGasOilNoNotBetween(String value1, String value2) { + addCriterion("gas_oil_no not between", value1, value2, "gasOilNo"); + return (Criteria) this; + } + + public Criteria andGasGunNoIsNull() { + addCriterion("gas_gun_no is null"); + return (Criteria) this; + } + + public Criteria andGasGunNoIsNotNull() { + addCriterion("gas_gun_no is not null"); + return (Criteria) this; + } + + public Criteria andGasGunNoEqualTo(String value) { + addCriterion("gas_gun_no =", value, "gasGunNo"); + return (Criteria) this; + } + + public Criteria andGasGunNoNotEqualTo(String value) { + addCriterion("gas_gun_no <>", value, "gasGunNo"); + return (Criteria) this; + } + + public Criteria andGasGunNoGreaterThan(String value) { + addCriterion("gas_gun_no >", value, "gasGunNo"); + return (Criteria) this; + } + + public Criteria andGasGunNoGreaterThanOrEqualTo(String value) { + addCriterion("gas_gun_no >=", value, "gasGunNo"); + return (Criteria) this; + } + + public Criteria andGasGunNoLessThan(String value) { + addCriterion("gas_gun_no <", value, "gasGunNo"); + return (Criteria) this; + } + + public Criteria andGasGunNoLessThanOrEqualTo(String value) { + addCriterion("gas_gun_no <=", value, "gasGunNo"); + return (Criteria) this; + } + + public Criteria andGasGunNoLike(String value) { + addCriterion("gas_gun_no like", value, "gasGunNo"); + return (Criteria) this; + } + + public Criteria andGasGunNoNotLike(String value) { + addCriterion("gas_gun_no not like", value, "gasGunNo"); + return (Criteria) this; + } + + public Criteria andGasGunNoIn(List values) { + addCriterion("gas_gun_no in", values, "gasGunNo"); + return (Criteria) this; + } + + public Criteria andGasGunNoNotIn(List values) { + addCriterion("gas_gun_no not in", values, "gasGunNo"); + return (Criteria) this; + } + + public Criteria andGasGunNoBetween(String value1, String value2) { + addCriterion("gas_gun_no between", value1, value2, "gasGunNo"); + return (Criteria) this; + } + + public Criteria andGasGunNoNotBetween(String value1, String value2) { + addCriterion("gas_gun_no not between", value1, value2, "gasGunNo"); + return (Criteria) this; + } + + public Criteria andGasOilTypeIsNull() { + addCriterion("gas_oil_type is null"); + return (Criteria) this; + } + + public Criteria andGasOilTypeIsNotNull() { + addCriterion("gas_oil_type is not null"); + return (Criteria) this; + } + + public Criteria andGasOilTypeEqualTo(Integer value) { + addCriterion("gas_oil_type =", value, "gasOilType"); + return (Criteria) this; + } + + public Criteria andGasOilTypeNotEqualTo(Integer value) { + addCriterion("gas_oil_type <>", value, "gasOilType"); + return (Criteria) this; + } + + public Criteria andGasOilTypeGreaterThan(Integer value) { + addCriterion("gas_oil_type >", value, "gasOilType"); + return (Criteria) this; + } + + public Criteria andGasOilTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("gas_oil_type >=", value, "gasOilType"); + return (Criteria) this; + } + + public Criteria andGasOilTypeLessThan(Integer value) { + addCriterion("gas_oil_type <", value, "gasOilType"); + return (Criteria) this; + } + + public Criteria andGasOilTypeLessThanOrEqualTo(Integer value) { + addCriterion("gas_oil_type <=", value, "gasOilType"); + return (Criteria) this; + } + + public Criteria andGasOilTypeIn(List values) { + addCriterion("gas_oil_type in", values, "gasOilType"); + return (Criteria) this; + } + + public Criteria andGasOilTypeNotIn(List values) { + addCriterion("gas_oil_type not in", values, "gasOilType"); + return (Criteria) this; + } + + public Criteria andGasOilTypeBetween(Integer value1, Integer value2) { + addCriterion("gas_oil_type between", value1, value2, "gasOilType"); + return (Criteria) this; + } + + public Criteria andGasOilTypeNotBetween(Integer value1, Integer value2) { + addCriterion("gas_oil_type not between", value1, value2, "gasOilType"); + return (Criteria) this; + } + + public Criteria andGasPricePlatformIsNull() { + addCriterion("gas_price_platform is null"); + return (Criteria) this; + } + + public Criteria andGasPricePlatformIsNotNull() { + addCriterion("gas_price_platform is not null"); + return (Criteria) this; + } + + public Criteria andGasPricePlatformEqualTo(BigDecimal value) { + addCriterion("gas_price_platform =", value, "gasPricePlatform"); + return (Criteria) this; + } + + public Criteria andGasPricePlatformNotEqualTo(BigDecimal value) { + addCriterion("gas_price_platform <>", value, "gasPricePlatform"); + return (Criteria) this; + } + + public Criteria andGasPricePlatformGreaterThan(BigDecimal value) { + addCriterion("gas_price_platform >", value, "gasPricePlatform"); + return (Criteria) this; + } + + public Criteria andGasPricePlatformGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_platform >=", value, "gasPricePlatform"); + return (Criteria) this; + } + + public Criteria andGasPricePlatformLessThan(BigDecimal value) { + addCriterion("gas_price_platform <", value, "gasPricePlatform"); + return (Criteria) this; + } + + public Criteria andGasPricePlatformLessThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_platform <=", value, "gasPricePlatform"); + return (Criteria) this; + } + + public Criteria andGasPricePlatformIn(List values) { + addCriterion("gas_price_platform in", values, "gasPricePlatform"); + return (Criteria) this; + } + + public Criteria andGasPricePlatformNotIn(List values) { + addCriterion("gas_price_platform not in", values, "gasPricePlatform"); + return (Criteria) this; + } + + public Criteria andGasPricePlatformBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_platform between", value1, value2, "gasPricePlatform"); + return (Criteria) this; + } + + public Criteria andGasPricePlatformNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_platform not between", value1, value2, "gasPricePlatform"); + return (Criteria) this; + } + + public Criteria andGasPriceGunIsNull() { + addCriterion("gas_price_gun is null"); + return (Criteria) this; + } + + public Criteria andGasPriceGunIsNotNull() { + addCriterion("gas_price_gun is not null"); + return (Criteria) this; + } + + public Criteria andGasPriceGunEqualTo(BigDecimal value) { + addCriterion("gas_price_gun =", value, "gasPriceGun"); + return (Criteria) this; + } + + public Criteria andGasPriceGunNotEqualTo(BigDecimal value) { + addCriterion("gas_price_gun <>", value, "gasPriceGun"); + return (Criteria) this; + } + + public Criteria andGasPriceGunGreaterThan(BigDecimal value) { + addCriterion("gas_price_gun >", value, "gasPriceGun"); + return (Criteria) this; + } + + public Criteria andGasPriceGunGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_gun >=", value, "gasPriceGun"); + return (Criteria) this; + } + + public Criteria andGasPriceGunLessThan(BigDecimal value) { + addCriterion("gas_price_gun <", value, "gasPriceGun"); + return (Criteria) this; + } + + public Criteria andGasPriceGunLessThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_gun <=", value, "gasPriceGun"); + return (Criteria) this; + } + + public Criteria andGasPriceGunIn(List values) { + addCriterion("gas_price_gun in", values, "gasPriceGun"); + return (Criteria) this; + } + + public Criteria andGasPriceGunNotIn(List values) { + addCriterion("gas_price_gun not in", values, "gasPriceGun"); + return (Criteria) this; + } + + public Criteria andGasPriceGunBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_gun between", value1, value2, "gasPriceGun"); + return (Criteria) this; + } + + public Criteria andGasPriceGunNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_gun not between", value1, value2, "gasPriceGun"); + return (Criteria) this; + } + + public Criteria andGasPriceVipIsNull() { + addCriterion("gas_price_vip is null"); + return (Criteria) this; + } + + public Criteria andGasPriceVipIsNotNull() { + addCriterion("gas_price_vip is not null"); + return (Criteria) this; + } + + public Criteria andGasPriceVipEqualTo(BigDecimal value) { + addCriterion("gas_price_vip =", value, "gasPriceVip"); + return (Criteria) this; + } + + public Criteria andGasPriceVipNotEqualTo(BigDecimal value) { + addCriterion("gas_price_vip <>", value, "gasPriceVip"); + return (Criteria) this; + } + + public Criteria andGasPriceVipGreaterThan(BigDecimal value) { + addCriterion("gas_price_vip >", value, "gasPriceVip"); + return (Criteria) this; + } + + public Criteria andGasPriceVipGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_vip >=", value, "gasPriceVip"); + return (Criteria) this; + } + + public Criteria andGasPriceVipLessThan(BigDecimal value) { + addCriterion("gas_price_vip <", value, "gasPriceVip"); + return (Criteria) this; + } + + public Criteria andGasPriceVipLessThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_vip <=", value, "gasPriceVip"); + return (Criteria) this; + } + + public Criteria andGasPriceVipIn(List values) { + addCriterion("gas_price_vip in", values, "gasPriceVip"); + return (Criteria) this; + } + + public Criteria andGasPriceVipNotIn(List values) { + addCriterion("gas_price_vip not in", values, "gasPriceVip"); + return (Criteria) this; + } + + public Criteria andGasPriceVipBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_vip between", value1, value2, "gasPriceVip"); + return (Criteria) this; + } + + public Criteria andGasPriceVipNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_vip not between", value1, value2, "gasPriceVip"); + return (Criteria) this; + } + + public Criteria andGasPriceOfficialIsNull() { + addCriterion("gas_price_official is null"); + return (Criteria) this; + } + + public Criteria andGasPriceOfficialIsNotNull() { + addCriterion("gas_price_official is not null"); + return (Criteria) this; + } + + public Criteria andGasPriceOfficialEqualTo(BigDecimal value) { + addCriterion("gas_price_official =", value, "gasPriceOfficial"); + return (Criteria) this; + } + + public Criteria andGasPriceOfficialNotEqualTo(BigDecimal value) { + addCriterion("gas_price_official <>", value, "gasPriceOfficial"); + return (Criteria) this; + } + + public Criteria andGasPriceOfficialGreaterThan(BigDecimal value) { + addCriterion("gas_price_official >", value, "gasPriceOfficial"); + return (Criteria) this; + } + + public Criteria andGasPriceOfficialGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_official >=", value, "gasPriceOfficial"); + return (Criteria) this; + } + + public Criteria andGasPriceOfficialLessThan(BigDecimal value) { + addCriterion("gas_price_official <", value, "gasPriceOfficial"); + return (Criteria) this; + } + + public Criteria andGasPriceOfficialLessThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_official <=", value, "gasPriceOfficial"); + return (Criteria) this; + } + + public Criteria andGasPriceOfficialIn(List values) { + addCriterion("gas_price_official in", values, "gasPriceOfficial"); + return (Criteria) this; + } + + public Criteria andGasPriceOfficialNotIn(List values) { + addCriterion("gas_price_official not in", values, "gasPriceOfficial"); + return (Criteria) this; + } + + public Criteria andGasPriceOfficialBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_official between", value1, value2, "gasPriceOfficial"); + return (Criteria) this; + } + + public Criteria andGasPriceOfficialNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_official not between", value1, value2, "gasPriceOfficial"); + return (Criteria) this; + } + + public Criteria andGasPriceCostIsNull() { + addCriterion("gas_price_cost is null"); + return (Criteria) this; + } + + public Criteria andGasPriceCostIsNotNull() { + addCriterion("gas_price_cost is not null"); + return (Criteria) this; + } + + public Criteria andGasPriceCostEqualTo(BigDecimal value) { + addCriterion("gas_price_cost =", value, "gasPriceCost"); + return (Criteria) this; + } + + public Criteria andGasPriceCostNotEqualTo(BigDecimal value) { + addCriterion("gas_price_cost <>", value, "gasPriceCost"); + return (Criteria) this; + } + + public Criteria andGasPriceCostGreaterThan(BigDecimal value) { + addCriterion("gas_price_cost >", value, "gasPriceCost"); + return (Criteria) this; + } + + public Criteria andGasPriceCostGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_cost >=", value, "gasPriceCost"); + return (Criteria) this; + } + + public Criteria andGasPriceCostLessThan(BigDecimal value) { + addCriterion("gas_price_cost <", value, "gasPriceCost"); + return (Criteria) this; + } + + public Criteria andGasPriceCostLessThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_cost <=", value, "gasPriceCost"); + return (Criteria) this; + } + + public Criteria andGasPriceCostIn(List values) { + addCriterion("gas_price_cost in", values, "gasPriceCost"); + return (Criteria) this; + } + + public Criteria andGasPriceCostNotIn(List values) { + addCriterion("gas_price_cost not in", values, "gasPriceCost"); + return (Criteria) this; + } + + public Criteria andGasPriceCostBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_cost between", value1, value2, "gasPriceCost"); + return (Criteria) this; + } + + public Criteria andGasPriceCostNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_cost not between", value1, value2, "gasPriceCost"); + return (Criteria) this; + } + + public Criteria andGasPriceCostTotalIsNull() { + addCriterion("gas_price_cost_total is null"); + return (Criteria) this; + } + + public Criteria andGasPriceCostTotalIsNotNull() { + addCriterion("gas_price_cost_total is not null"); + return (Criteria) this; + } + + public Criteria andGasPriceCostTotalEqualTo(BigDecimal value) { + addCriterion("gas_price_cost_total =", value, "gasPriceCostTotal"); + return (Criteria) this; + } + + public Criteria andGasPriceCostTotalNotEqualTo(BigDecimal value) { + addCriterion("gas_price_cost_total <>", value, "gasPriceCostTotal"); + return (Criteria) this; + } + + public Criteria andGasPriceCostTotalGreaterThan(BigDecimal value) { + addCriterion("gas_price_cost_total >", value, "gasPriceCostTotal"); + return (Criteria) this; + } + + public Criteria andGasPriceCostTotalGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_cost_total >=", value, "gasPriceCostTotal"); + return (Criteria) this; + } + + public Criteria andGasPriceCostTotalLessThan(BigDecimal value) { + addCriterion("gas_price_cost_total <", value, "gasPriceCostTotal"); + return (Criteria) this; + } + + public Criteria andGasPriceCostTotalLessThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_cost_total <=", value, "gasPriceCostTotal"); + return (Criteria) this; + } + + public Criteria andGasPriceCostTotalIn(List values) { + addCriterion("gas_price_cost_total in", values, "gasPriceCostTotal"); + return (Criteria) this; + } + + public Criteria andGasPriceCostTotalNotIn(List values) { + addCriterion("gas_price_cost_total not in", values, "gasPriceCostTotal"); + return (Criteria) this; + } + + public Criteria andGasPriceCostTotalBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_cost_total between", value1, value2, "gasPriceCostTotal"); + return (Criteria) this; + } + + public Criteria andGasPriceCostTotalNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_cost_total not between", value1, value2, "gasPriceCostTotal"); + return (Criteria) this; + } + + public Criteria andGasPriceChannelPayIsNull() { + addCriterion("gas_price_channel_pay is null"); + return (Criteria) this; + } + + public Criteria andGasPriceChannelPayIsNotNull() { + addCriterion("gas_price_channel_pay is not null"); + return (Criteria) this; + } + + public Criteria andGasPriceChannelPayEqualTo(BigDecimal value) { + addCriterion("gas_price_channel_pay =", value, "gasPriceChannelPay"); + return (Criteria) this; + } + + public Criteria andGasPriceChannelPayNotEqualTo(BigDecimal value) { + addCriterion("gas_price_channel_pay <>", value, "gasPriceChannelPay"); + return (Criteria) this; + } + + public Criteria andGasPriceChannelPayGreaterThan(BigDecimal value) { + addCriterion("gas_price_channel_pay >", value, "gasPriceChannelPay"); + return (Criteria) this; + } + + public Criteria andGasPriceChannelPayGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_channel_pay >=", value, "gasPriceChannelPay"); + return (Criteria) this; + } + + public Criteria andGasPriceChannelPayLessThan(BigDecimal value) { + addCriterion("gas_price_channel_pay <", value, "gasPriceChannelPay"); + return (Criteria) this; + } + + public Criteria andGasPriceChannelPayLessThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_channel_pay <=", value, "gasPriceChannelPay"); + return (Criteria) this; + } + + public Criteria andGasPriceChannelPayIn(List values) { + addCriterion("gas_price_channel_pay in", values, "gasPriceChannelPay"); + return (Criteria) this; + } + + public Criteria andGasPriceChannelPayNotIn(List values) { + addCriterion("gas_price_channel_pay not in", values, "gasPriceChannelPay"); + return (Criteria) this; + } + + public Criteria andGasPriceChannelPayBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_channel_pay between", value1, value2, "gasPriceChannelPay"); + return (Criteria) this; + } + + public Criteria andGasPriceChannelPayNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_channel_pay not between", value1, value2, "gasPriceChannelPay"); + return (Criteria) this; + } + + public Criteria andGasOilLitersIsNull() { + addCriterion("gas_oil_liters is null"); + return (Criteria) this; + } + + public Criteria andGasOilLitersIsNotNull() { + addCriterion("gas_oil_liters is not null"); + return (Criteria) this; + } + + public Criteria andGasOilLitersEqualTo(BigDecimal value) { + addCriterion("gas_oil_liters =", value, "gasOilLiters"); + return (Criteria) this; + } + + public Criteria andGasOilLitersNotEqualTo(BigDecimal value) { + addCriterion("gas_oil_liters <>", value, "gasOilLiters"); + return (Criteria) this; + } + + public Criteria andGasOilLitersGreaterThan(BigDecimal value) { + addCriterion("gas_oil_liters >", value, "gasOilLiters"); + return (Criteria) this; + } + + public Criteria andGasOilLitersGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("gas_oil_liters >=", value, "gasOilLiters"); + return (Criteria) this; + } + + public Criteria andGasOilLitersLessThan(BigDecimal value) { + addCriterion("gas_oil_liters <", value, "gasOilLiters"); + return (Criteria) this; + } + + public Criteria andGasOilLitersLessThanOrEqualTo(BigDecimal value) { + addCriterion("gas_oil_liters <=", value, "gasOilLiters"); + return (Criteria) this; + } + + public Criteria andGasOilLitersIn(List values) { + addCriterion("gas_oil_liters in", values, "gasOilLiters"); + return (Criteria) this; + } + + public Criteria andGasOilLitersNotIn(List values) { + addCriterion("gas_oil_liters not in", values, "gasOilLiters"); + return (Criteria) this; + } + + public Criteria andGasOilLitersBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_oil_liters between", value1, value2, "gasOilLiters"); + return (Criteria) this; + } + + public Criteria andGasOilLitersNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_oil_liters not between", value1, value2, "gasOilLiters"); + return (Criteria) this; + } + + public Criteria andGasDiscountIsNull() { + addCriterion("gas_discount is null"); + return (Criteria) this; + } + + public Criteria andGasDiscountIsNotNull() { + addCriterion("gas_discount is not null"); + return (Criteria) this; + } + + public Criteria andGasDiscountEqualTo(BigDecimal value) { + addCriterion("gas_discount =", value, "gasDiscount"); + return (Criteria) this; + } + + public Criteria andGasDiscountNotEqualTo(BigDecimal value) { + addCriterion("gas_discount <>", value, "gasDiscount"); + return (Criteria) this; + } + + public Criteria andGasDiscountGreaterThan(BigDecimal value) { + addCriterion("gas_discount >", value, "gasDiscount"); + return (Criteria) this; + } + + public Criteria andGasDiscountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("gas_discount >=", value, "gasDiscount"); + return (Criteria) this; + } + + public Criteria andGasDiscountLessThan(BigDecimal value) { + addCriterion("gas_discount <", value, "gasDiscount"); + return (Criteria) this; + } + + public Criteria andGasDiscountLessThanOrEqualTo(BigDecimal value) { + addCriterion("gas_discount <=", value, "gasDiscount"); + return (Criteria) this; + } + + public Criteria andGasDiscountIn(List values) { + addCriterion("gas_discount in", values, "gasDiscount"); + return (Criteria) this; + } + + public Criteria andGasDiscountNotIn(List values) { + addCriterion("gas_discount not in", values, "gasDiscount"); + return (Criteria) this; + } + + public Criteria andGasDiscountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_discount between", value1, value2, "gasDiscount"); + return (Criteria) this; + } + + public Criteria andGasDiscountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_discount not between", value1, value2, "gasDiscount"); + return (Criteria) this; + } + + public Criteria andGasOilSubsidyIsNull() { + addCriterion("gas_oil_subsidy is null"); + return (Criteria) this; + } + + public Criteria andGasOilSubsidyIsNotNull() { + addCriterion("gas_oil_subsidy is not null"); + return (Criteria) this; + } + + public Criteria andGasOilSubsidyEqualTo(BigDecimal value) { + addCriterion("gas_oil_subsidy =", value, "gasOilSubsidy"); + return (Criteria) this; + } + + public Criteria andGasOilSubsidyNotEqualTo(BigDecimal value) { + addCriterion("gas_oil_subsidy <>", value, "gasOilSubsidy"); + return (Criteria) this; + } + + public Criteria andGasOilSubsidyGreaterThan(BigDecimal value) { + addCriterion("gas_oil_subsidy >", value, "gasOilSubsidy"); + return (Criteria) this; + } + + public Criteria andGasOilSubsidyGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("gas_oil_subsidy >=", value, "gasOilSubsidy"); + return (Criteria) this; + } + + public Criteria andGasOilSubsidyLessThan(BigDecimal value) { + addCriterion("gas_oil_subsidy <", value, "gasOilSubsidy"); + return (Criteria) this; + } + + public Criteria andGasOilSubsidyLessThanOrEqualTo(BigDecimal value) { + addCriterion("gas_oil_subsidy <=", value, "gasOilSubsidy"); + return (Criteria) this; + } + + public Criteria andGasOilSubsidyIn(List values) { + addCriterion("gas_oil_subsidy in", values, "gasOilSubsidy"); + return (Criteria) this; + } + + public Criteria andGasOilSubsidyNotIn(List values) { + addCriterion("gas_oil_subsidy not in", values, "gasOilSubsidy"); + return (Criteria) this; + } + + public Criteria andGasOilSubsidyBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_oil_subsidy between", value1, value2, "gasOilSubsidy"); + return (Criteria) this; + } + + public Criteria andGasOilSubsidyNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_oil_subsidy not between", value1, value2, "gasOilSubsidy"); + return (Criteria) this; + } + + public Criteria andGasLitersPreferencesIsNull() { + addCriterion("gas_liters_preferences is null"); + return (Criteria) this; + } + + public Criteria andGasLitersPreferencesIsNotNull() { + addCriterion("gas_liters_preferences is not null"); + return (Criteria) this; + } + + public Criteria andGasLitersPreferencesEqualTo(BigDecimal value) { + addCriterion("gas_liters_preferences =", value, "gasLitersPreferences"); + return (Criteria) this; + } + + public Criteria andGasLitersPreferencesNotEqualTo(BigDecimal value) { + addCriterion("gas_liters_preferences <>", value, "gasLitersPreferences"); + return (Criteria) this; + } + + public Criteria andGasLitersPreferencesGreaterThan(BigDecimal value) { + addCriterion("gas_liters_preferences >", value, "gasLitersPreferences"); + return (Criteria) this; + } + + public Criteria andGasLitersPreferencesGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("gas_liters_preferences >=", value, "gasLitersPreferences"); + return (Criteria) this; + } + + public Criteria andGasLitersPreferencesLessThan(BigDecimal value) { + addCriterion("gas_liters_preferences <", value, "gasLitersPreferences"); + return (Criteria) this; + } + + public Criteria andGasLitersPreferencesLessThanOrEqualTo(BigDecimal value) { + addCriterion("gas_liters_preferences <=", value, "gasLitersPreferences"); + return (Criteria) this; + } + + public Criteria andGasLitersPreferencesIn(List values) { + addCriterion("gas_liters_preferences in", values, "gasLitersPreferences"); + return (Criteria) this; + } + + public Criteria andGasLitersPreferencesNotIn(List values) { + addCriterion("gas_liters_preferences not in", values, "gasLitersPreferences"); + return (Criteria) this; + } + + public Criteria andGasLitersPreferencesBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_liters_preferences between", value1, value2, "gasLitersPreferences"); + return (Criteria) this; + } + + public Criteria andGasLitersPreferencesNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_liters_preferences not between", value1, value2, "gasLitersPreferences"); + return (Criteria) this; + } + + public Criteria andGasPricePreferencesIsNull() { + addCriterion("gas_price_preferences is null"); + return (Criteria) this; + } + + public Criteria andGasPricePreferencesIsNotNull() { + addCriterion("gas_price_preferences is not null"); + return (Criteria) this; + } + + public Criteria andGasPricePreferencesEqualTo(BigDecimal value) { + addCriterion("gas_price_preferences =", value, "gasPricePreferences"); + return (Criteria) this; + } + + public Criteria andGasPricePreferencesNotEqualTo(BigDecimal value) { + addCriterion("gas_price_preferences <>", value, "gasPricePreferences"); + return (Criteria) this; + } + + public Criteria andGasPricePreferencesGreaterThan(BigDecimal value) { + addCriterion("gas_price_preferences >", value, "gasPricePreferences"); + return (Criteria) this; + } + + public Criteria andGasPricePreferencesGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_preferences >=", value, "gasPricePreferences"); + return (Criteria) this; + } + + public Criteria andGasPricePreferencesLessThan(BigDecimal value) { + addCriterion("gas_price_preferences <", value, "gasPricePreferences"); + return (Criteria) this; + } + + public Criteria andGasPricePreferencesLessThanOrEqualTo(BigDecimal value) { + addCriterion("gas_price_preferences <=", value, "gasPricePreferences"); + return (Criteria) this; + } + + public Criteria andGasPricePreferencesIn(List values) { + addCriterion("gas_price_preferences in", values, "gasPricePreferences"); + return (Criteria) this; + } + + public Criteria andGasPricePreferencesNotIn(List values) { + addCriterion("gas_price_preferences not in", values, "gasPricePreferences"); + return (Criteria) this; + } + + public Criteria andGasPricePreferencesBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_preferences between", value1, value2, "gasPricePreferences"); + return (Criteria) this; + } + + public Criteria andGasPricePreferencesNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gas_price_preferences not between", value1, value2, "gasPricePreferences"); + return (Criteria) this; + } + + public Criteria andGasClassGroupIdIsNull() { + addCriterion("gas_class_group_id is null"); + return (Criteria) this; + } + + public Criteria andGasClassGroupIdIsNotNull() { + addCriterion("gas_class_group_id is not null"); + return (Criteria) this; + } + + public Criteria andGasClassGroupIdEqualTo(Long value) { + addCriterion("gas_class_group_id =", value, "gasClassGroupId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupIdNotEqualTo(Long value) { + addCriterion("gas_class_group_id <>", value, "gasClassGroupId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupIdGreaterThan(Long value) { + addCriterion("gas_class_group_id >", value, "gasClassGroupId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupIdGreaterThanOrEqualTo(Long value) { + addCriterion("gas_class_group_id >=", value, "gasClassGroupId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupIdLessThan(Long value) { + addCriterion("gas_class_group_id <", value, "gasClassGroupId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupIdLessThanOrEqualTo(Long value) { + addCriterion("gas_class_group_id <=", value, "gasClassGroupId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupIdIn(List values) { + addCriterion("gas_class_group_id in", values, "gasClassGroupId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupIdNotIn(List values) { + addCriterion("gas_class_group_id not in", values, "gasClassGroupId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupIdBetween(Long value1, Long value2) { + addCriterion("gas_class_group_id between", value1, value2, "gasClassGroupId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupIdNotBetween(Long value1, Long value2) { + addCriterion("gas_class_group_id not between", value1, value2, "gasClassGroupId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupNameIsNull() { + addCriterion("gas_class_group_name is null"); + return (Criteria) this; + } + + public Criteria andGasClassGroupNameIsNotNull() { + addCriterion("gas_class_group_name is not null"); + return (Criteria) this; + } + + public Criteria andGasClassGroupNameEqualTo(String value) { + addCriterion("gas_class_group_name =", value, "gasClassGroupName"); + return (Criteria) this; + } + + public Criteria andGasClassGroupNameNotEqualTo(String value) { + addCriterion("gas_class_group_name <>", value, "gasClassGroupName"); + return (Criteria) this; + } + + public Criteria andGasClassGroupNameGreaterThan(String value) { + addCriterion("gas_class_group_name >", value, "gasClassGroupName"); + return (Criteria) this; + } + + public Criteria andGasClassGroupNameGreaterThanOrEqualTo(String value) { + addCriterion("gas_class_group_name >=", value, "gasClassGroupName"); + return (Criteria) this; + } + + public Criteria andGasClassGroupNameLessThan(String value) { + addCriterion("gas_class_group_name <", value, "gasClassGroupName"); + return (Criteria) this; + } + + public Criteria andGasClassGroupNameLessThanOrEqualTo(String value) { + addCriterion("gas_class_group_name <=", value, "gasClassGroupName"); + return (Criteria) this; + } + + public Criteria andGasClassGroupNameLike(String value) { + addCriterion("gas_class_group_name like", value, "gasClassGroupName"); + return (Criteria) this; + } + + public Criteria andGasClassGroupNameNotLike(String value) { + addCriterion("gas_class_group_name not like", value, "gasClassGroupName"); + return (Criteria) this; + } + + public Criteria andGasClassGroupNameIn(List values) { + addCriterion("gas_class_group_name in", values, "gasClassGroupName"); + return (Criteria) this; + } + + public Criteria andGasClassGroupNameNotIn(List values) { + addCriterion("gas_class_group_name not in", values, "gasClassGroupName"); + return (Criteria) this; + } + + public Criteria andGasClassGroupNameBetween(String value1, String value2) { + addCriterion("gas_class_group_name between", value1, value2, "gasClassGroupName"); + return (Criteria) this; + } + + public Criteria andGasClassGroupNameNotBetween(String value1, String value2) { + addCriterion("gas_class_group_name not between", value1, value2, "gasClassGroupName"); + return (Criteria) this; + } + + public Criteria andGasClassGroupTaskIdIsNull() { + addCriterion("gas_class_group_task_id is null"); + return (Criteria) this; + } + + public Criteria andGasClassGroupTaskIdIsNotNull() { + addCriterion("gas_class_group_task_id is not null"); + return (Criteria) this; + } + + public Criteria andGasClassGroupTaskIdEqualTo(Long value) { + addCriterion("gas_class_group_task_id =", value, "gasClassGroupTaskId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupTaskIdNotEqualTo(Long value) { + addCriterion("gas_class_group_task_id <>", value, "gasClassGroupTaskId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupTaskIdGreaterThan(Long value) { + addCriterion("gas_class_group_task_id >", value, "gasClassGroupTaskId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupTaskIdGreaterThanOrEqualTo(Long value) { + addCriterion("gas_class_group_task_id >=", value, "gasClassGroupTaskId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupTaskIdLessThan(Long value) { + addCriterion("gas_class_group_task_id <", value, "gasClassGroupTaskId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupTaskIdLessThanOrEqualTo(Long value) { + addCriterion("gas_class_group_task_id <=", value, "gasClassGroupTaskId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupTaskIdIn(List values) { + addCriterion("gas_class_group_task_id in", values, "gasClassGroupTaskId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupTaskIdNotIn(List values) { + addCriterion("gas_class_group_task_id not in", values, "gasClassGroupTaskId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupTaskIdBetween(Long value1, Long value2) { + addCriterion("gas_class_group_task_id between", value1, value2, "gasClassGroupTaskId"); + return (Criteria) this; + } + + public Criteria andGasClassGroupTaskIdNotBetween(Long value1, Long value2) { + addCriterion("gas_class_group_task_id not between", value1, value2, "gasClassGroupTaskId"); + return (Criteria) this; + } + + public Criteria andGasStaffIdIsNull() { + addCriterion("gas_staff_id is null"); + return (Criteria) this; + } + + public Criteria andGasStaffIdIsNotNull() { + addCriterion("gas_staff_id is not null"); + return (Criteria) this; + } + + public Criteria andGasStaffIdEqualTo(Long value) { + addCriterion("gas_staff_id =", value, "gasStaffId"); + return (Criteria) this; + } + + public Criteria andGasStaffIdNotEqualTo(Long value) { + addCriterion("gas_staff_id <>", value, "gasStaffId"); + return (Criteria) this; + } + + public Criteria andGasStaffIdGreaterThan(Long value) { + addCriterion("gas_staff_id >", value, "gasStaffId"); + return (Criteria) this; + } + + public Criteria andGasStaffIdGreaterThanOrEqualTo(Long value) { + addCriterion("gas_staff_id >=", value, "gasStaffId"); + return (Criteria) this; + } + + public Criteria andGasStaffIdLessThan(Long value) { + addCriterion("gas_staff_id <", value, "gasStaffId"); + return (Criteria) this; + } + + public Criteria andGasStaffIdLessThanOrEqualTo(Long value) { + addCriterion("gas_staff_id <=", value, "gasStaffId"); + return (Criteria) this; + } + + public Criteria andGasStaffIdIn(List values) { + addCriterion("gas_staff_id in", values, "gasStaffId"); + return (Criteria) this; + } + + public Criteria andGasStaffIdNotIn(List values) { + addCriterion("gas_staff_id not in", values, "gasStaffId"); + return (Criteria) this; + } + + public Criteria andGasStaffIdBetween(Long value1, Long value2) { + addCriterion("gas_staff_id between", value1, value2, "gasStaffId"); + return (Criteria) this; + } + + public Criteria andGasStaffIdNotBetween(Long value1, Long value2) { + addCriterion("gas_staff_id not between", value1, value2, "gasStaffId"); + return (Criteria) this; + } + + public Criteria andGasStaffNameIsNull() { + addCriterion("gas_staff_name is null"); + return (Criteria) this; + } + + public Criteria andGasStaffNameIsNotNull() { + addCriterion("gas_staff_name is not null"); + return (Criteria) this; + } + + public Criteria andGasStaffNameEqualTo(String value) { + addCriterion("gas_staff_name =", value, "gasStaffName"); + return (Criteria) this; + } + + public Criteria andGasStaffNameNotEqualTo(String value) { + addCriterion("gas_staff_name <>", value, "gasStaffName"); + return (Criteria) this; + } + + public Criteria andGasStaffNameGreaterThan(String value) { + addCriterion("gas_staff_name >", value, "gasStaffName"); + return (Criteria) this; + } + + public Criteria andGasStaffNameGreaterThanOrEqualTo(String value) { + addCriterion("gas_staff_name >=", value, "gasStaffName"); + return (Criteria) this; + } + + public Criteria andGasStaffNameLessThan(String value) { + addCriterion("gas_staff_name <", value, "gasStaffName"); + return (Criteria) this; + } + + public Criteria andGasStaffNameLessThanOrEqualTo(String value) { + addCriterion("gas_staff_name <=", value, "gasStaffName"); + return (Criteria) this; + } + + public Criteria andGasStaffNameLike(String value) { + addCriterion("gas_staff_name like", value, "gasStaffName"); + return (Criteria) this; + } + + public Criteria andGasStaffNameNotLike(String value) { + addCriterion("gas_staff_name not like", value, "gasStaffName"); + return (Criteria) this; + } + + public Criteria andGasStaffNameIn(List values) { + addCriterion("gas_staff_name in", values, "gasStaffName"); + return (Criteria) this; + } + + public Criteria andGasStaffNameNotIn(List values) { + addCriterion("gas_staff_name not in", values, "gasStaffName"); + return (Criteria) this; + } + + public Criteria andGasStaffNameBetween(String value1, String value2) { + addCriterion("gas_staff_name between", value1, value2, "gasStaffName"); + return (Criteria) this; + } + + public Criteria andGasStaffNameNotBetween(String value1, String value2) { + addCriterion("gas_staff_name not between", value1, value2, "gasStaffName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdIsNull() { + addCriterion("gas_salesman_id is null"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdIsNotNull() { + addCriterion("gas_salesman_id is not null"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdEqualTo(Long value) { + addCriterion("gas_salesman_id =", value, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdNotEqualTo(Long value) { + addCriterion("gas_salesman_id <>", value, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdGreaterThan(Long value) { + addCriterion("gas_salesman_id >", value, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdGreaterThanOrEqualTo(Long value) { + addCriterion("gas_salesman_id >=", value, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdLessThan(Long value) { + addCriterion("gas_salesman_id <", value, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdLessThanOrEqualTo(Long value) { + addCriterion("gas_salesman_id <=", value, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdIn(List values) { + addCriterion("gas_salesman_id in", values, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdNotIn(List values) { + addCriterion("gas_salesman_id not in", values, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdBetween(Long value1, Long value2) { + addCriterion("gas_salesman_id between", value1, value2, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanIdNotBetween(Long value1, Long value2) { + addCriterion("gas_salesman_id not between", value1, value2, "gasSalesmanId"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameIsNull() { + addCriterion("gas_salesman_name is null"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameIsNotNull() { + addCriterion("gas_salesman_name is not null"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameEqualTo(String value) { + addCriterion("gas_salesman_name =", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameNotEqualTo(String value) { + addCriterion("gas_salesman_name <>", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameGreaterThan(String value) { + addCriterion("gas_salesman_name >", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameGreaterThanOrEqualTo(String value) { + addCriterion("gas_salesman_name >=", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameLessThan(String value) { + addCriterion("gas_salesman_name <", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameLessThanOrEqualTo(String value) { + addCriterion("gas_salesman_name <=", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameLike(String value) { + addCriterion("gas_salesman_name like", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameNotLike(String value) { + addCriterion("gas_salesman_name not like", value, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameIn(List values) { + addCriterion("gas_salesman_name in", values, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameNotIn(List values) { + addCriterion("gas_salesman_name not in", values, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameBetween(String value1, String value2) { + addCriterion("gas_salesman_name between", value1, value2, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasSalesmanNameNotBetween(String value1, String value2) { + addCriterion("gas_salesman_name not between", value1, value2, "gasSalesmanName"); + return (Criteria) this; + } + + public Criteria andGasAgentIdIsNull() { + addCriterion("gas_agent_id is null"); + return (Criteria) this; + } + + public Criteria andGasAgentIdIsNotNull() { + addCriterion("gas_agent_id is not null"); + return (Criteria) this; + } + + public Criteria andGasAgentIdEqualTo(Long value) { + addCriterion("gas_agent_id =", value, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdNotEqualTo(Long value) { + addCriterion("gas_agent_id <>", value, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdGreaterThan(Long value) { + addCriterion("gas_agent_id >", value, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdGreaterThanOrEqualTo(Long value) { + addCriterion("gas_agent_id >=", value, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdLessThan(Long value) { + addCriterion("gas_agent_id <", value, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdLessThanOrEqualTo(Long value) { + addCriterion("gas_agent_id <=", value, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdIn(List values) { + addCriterion("gas_agent_id in", values, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdNotIn(List values) { + addCriterion("gas_agent_id not in", values, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdBetween(Long value1, Long value2) { + addCriterion("gas_agent_id between", value1, value2, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentIdNotBetween(Long value1, Long value2) { + addCriterion("gas_agent_id not between", value1, value2, "gasAgentId"); + return (Criteria) this; + } + + public Criteria andGasAgentNameIsNull() { + addCriterion("gas_agent_name is null"); + return (Criteria) this; + } + + public Criteria andGasAgentNameIsNotNull() { + addCriterion("gas_agent_name is not null"); + return (Criteria) this; + } + + public Criteria andGasAgentNameEqualTo(String value) { + addCriterion("gas_agent_name =", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameNotEqualTo(String value) { + addCriterion("gas_agent_name <>", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameGreaterThan(String value) { + addCriterion("gas_agent_name >", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameGreaterThanOrEqualTo(String value) { + addCriterion("gas_agent_name >=", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameLessThan(String value) { + addCriterion("gas_agent_name <", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameLessThanOrEqualTo(String value) { + addCriterion("gas_agent_name <=", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameLike(String value) { + addCriterion("gas_agent_name like", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameNotLike(String value) { + addCriterion("gas_agent_name not like", value, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameIn(List values) { + addCriterion("gas_agent_name in", values, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameNotIn(List values) { + addCriterion("gas_agent_name not in", values, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameBetween(String value1, String value2) { + addCriterion("gas_agent_name between", value1, value2, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasAgentNameNotBetween(String value1, String value2) { + addCriterion("gas_agent_name not between", value1, value2, "gasAgentName"); + return (Criteria) this; + } + + public Criteria andGasOrgIdIsNull() { + addCriterion("gas_org_id is null"); + return (Criteria) this; + } + + public Criteria andGasOrgIdIsNotNull() { + addCriterion("gas_org_id is not null"); + return (Criteria) this; + } + + public Criteria andGasOrgIdEqualTo(Long value) { + addCriterion("gas_org_id =", value, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdNotEqualTo(Long value) { + addCriterion("gas_org_id <>", value, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdGreaterThan(Long value) { + addCriterion("gas_org_id >", value, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdGreaterThanOrEqualTo(Long value) { + addCriterion("gas_org_id >=", value, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdLessThan(Long value) { + addCriterion("gas_org_id <", value, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdLessThanOrEqualTo(Long value) { + addCriterion("gas_org_id <=", value, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdIn(List values) { + addCriterion("gas_org_id in", values, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdNotIn(List values) { + addCriterion("gas_org_id not in", values, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdBetween(Long value1, Long value2) { + addCriterion("gas_org_id between", value1, value2, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgIdNotBetween(Long value1, Long value2) { + addCriterion("gas_org_id not between", value1, value2, "gasOrgId"); + return (Criteria) this; + } + + public Criteria andGasOrgNameIsNull() { + addCriterion("gas_org_name is null"); + return (Criteria) this; + } + + public Criteria andGasOrgNameIsNotNull() { + addCriterion("gas_org_name is not null"); + return (Criteria) this; + } + + public Criteria andGasOrgNameEqualTo(String value) { + addCriterion("gas_org_name =", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameNotEqualTo(String value) { + addCriterion("gas_org_name <>", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameGreaterThan(String value) { + addCriterion("gas_org_name >", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameGreaterThanOrEqualTo(String value) { + addCriterion("gas_org_name >=", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameLessThan(String value) { + addCriterion("gas_org_name <", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameLessThanOrEqualTo(String value) { + addCriterion("gas_org_name <=", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameLike(String value) { + addCriterion("gas_org_name like", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameNotLike(String value) { + addCriterion("gas_org_name not like", value, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameIn(List values) { + addCriterion("gas_org_name in", values, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameNotIn(List values) { + addCriterion("gas_org_name not in", values, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameBetween(String value1, String value2) { + addCriterion("gas_org_name between", value1, value2, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andGasOrgNameNotBetween(String value1, String value2) { + addCriterion("gas_org_name not between", value1, value2, "gasOrgName"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("`status` is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("`status` is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Integer value) { + addCriterion("`status` =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Integer value) { + addCriterion("`status` <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Integer value) { + addCriterion("`status` >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("`status` >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Integer value) { + addCriterion("`status` <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Integer value) { + addCriterion("`status` <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("`status` in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("`status` not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Integer value1, Integer value2) { + addCriterion("`status` between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Integer value1, Integer value2) { + addCriterion("`status` not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria 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 andPayTimeIsNull() { + addCriterion("pay_time is null"); + return (Criteria) this; + } + + public Criteria andPayTimeIsNotNull() { + addCriterion("pay_time is not null"); + return (Criteria) this; + } + + public Criteria andPayTimeEqualTo(Date value) { + addCriterion("pay_time =", value, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeNotEqualTo(Date value) { + addCriterion("pay_time <>", value, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeGreaterThan(Date value) { + addCriterion("pay_time >", value, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeGreaterThanOrEqualTo(Date value) { + addCriterion("pay_time >=", value, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeLessThan(Date value) { + addCriterion("pay_time <", value, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeLessThanOrEqualTo(Date value) { + addCriterion("pay_time <=", value, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeIn(List values) { + addCriterion("pay_time in", values, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeNotIn(List values) { + addCriterion("pay_time not in", values, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeBetween(Date value1, Date value2) { + addCriterion("pay_time between", value1, value2, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeNotBetween(Date value1, Date value2) { + addCriterion("pay_time not between", value1, value2, "payTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeIsNull() { + addCriterion("finish_time is null"); + return (Criteria) this; + } + + public Criteria andFinishTimeIsNotNull() { + addCriterion("finish_time is not null"); + return (Criteria) this; + } + + public Criteria andFinishTimeEqualTo(Date value) { + addCriterion("finish_time =", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotEqualTo(Date value) { + addCriterion("finish_time <>", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeGreaterThan(Date value) { + addCriterion("finish_time >", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeGreaterThanOrEqualTo(Date value) { + addCriterion("finish_time >=", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeLessThan(Date value) { + addCriterion("finish_time <", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeLessThanOrEqualTo(Date value) { + addCriterion("finish_time <=", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeIn(List values) { + addCriterion("finish_time in", values, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotIn(List values) { + addCriterion("finish_time not in", values, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeBetween(Date value1, Date value2) { + addCriterion("finish_time between", value1, value2, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotBetween(Date value1, Date value2) { + addCriterion("finish_time not between", value1, value2, "finishTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeIsNull() { + addCriterion("refund_time is null"); + return (Criteria) this; + } + + public Criteria andRefundTimeIsNotNull() { + addCriterion("refund_time is not null"); + return (Criteria) this; + } + + public Criteria andRefundTimeEqualTo(Date value) { + addCriterion("refund_time =", value, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeNotEqualTo(Date value) { + addCriterion("refund_time <>", value, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeGreaterThan(Date value) { + addCriterion("refund_time >", value, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeGreaterThanOrEqualTo(Date value) { + addCriterion("refund_time >=", value, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeLessThan(Date value) { + addCriterion("refund_time <", value, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeLessThanOrEqualTo(Date value) { + addCriterion("refund_time <=", value, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeIn(List values) { + addCriterion("refund_time in", values, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeNotIn(List values) { + addCriterion("refund_time not in", values, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeBetween(Date value1, Date value2) { + addCriterion("refund_time between", value1, value2, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeNotBetween(Date value1, Date value2) { + addCriterion("refund_time not between", value1, value2, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundRemarksIsNull() { + addCriterion("refund_remarks is null"); + return (Criteria) this; + } + + public Criteria andRefundRemarksIsNotNull() { + addCriterion("refund_remarks is not null"); + return (Criteria) this; + } + + public Criteria andRefundRemarksEqualTo(String value) { + addCriterion("refund_remarks =", value, "refundRemarks"); + return (Criteria) this; + } + + public Criteria andRefundRemarksNotEqualTo(String value) { + addCriterion("refund_remarks <>", value, "refundRemarks"); + return (Criteria) this; + } + + public Criteria andRefundRemarksGreaterThan(String value) { + addCriterion("refund_remarks >", value, "refundRemarks"); + return (Criteria) this; + } + + public Criteria andRefundRemarksGreaterThanOrEqualTo(String value) { + addCriterion("refund_remarks >=", value, "refundRemarks"); + return (Criteria) this; + } + + public Criteria andRefundRemarksLessThan(String value) { + addCriterion("refund_remarks <", value, "refundRemarks"); + return (Criteria) this; + } + + public Criteria andRefundRemarksLessThanOrEqualTo(String value) { + addCriterion("refund_remarks <=", value, "refundRemarks"); + return (Criteria) this; + } + + public Criteria andRefundRemarksLike(String value) { + addCriterion("refund_remarks like", value, "refundRemarks"); + return (Criteria) this; + } + + public Criteria andRefundRemarksNotLike(String value) { + addCriterion("refund_remarks not like", value, "refundRemarks"); + return (Criteria) this; + } + + public Criteria andRefundRemarksIn(List values) { + addCriterion("refund_remarks in", values, "refundRemarks"); + return (Criteria) this; + } + + public Criteria andRefundRemarksNotIn(List values) { + addCriterion("refund_remarks not in", values, "refundRemarks"); + return (Criteria) this; + } + + public Criteria andRefundRemarksBetween(String value1, String value2) { + addCriterion("refund_remarks between", value1, value2, "refundRemarks"); + return (Criteria) this; + } + + public Criteria andRefundRemarksNotBetween(String value1, String value2) { + addCriterion("refund_remarks not between", value1, value2, "refundRemarks"); + 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 Criteria andExt4IsNull() { + addCriterion("ext_4 is null"); + return (Criteria) this; + } + + public Criteria andExt4IsNotNull() { + addCriterion("ext_4 is not null"); + return (Criteria) this; + } + + public Criteria andExt4EqualTo(String value) { + addCriterion("ext_4 =", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4NotEqualTo(String value) { + addCriterion("ext_4 <>", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4GreaterThan(String value) { + addCriterion("ext_4 >", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4GreaterThanOrEqualTo(String value) { + addCriterion("ext_4 >=", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4LessThan(String value) { + addCriterion("ext_4 <", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4LessThanOrEqualTo(String value) { + addCriterion("ext_4 <=", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4Like(String value) { + addCriterion("ext_4 like", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4NotLike(String value) { + addCriterion("ext_4 not like", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4In(List values) { + addCriterion("ext_4 in", values, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4NotIn(List values) { + addCriterion("ext_4 not in", values, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4Between(String value1, String value2) { + addCriterion("ext_4 between", value1, value2, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4NotBetween(String value1, String value2) { + addCriterion("ext_4 not between", value1, value2, "ext4"); + return (Criteria) this; + } + + public Criteria andExt5IsNull() { + addCriterion("ext_5 is null"); + return (Criteria) this; + } + + public Criteria andExt5IsNotNull() { + addCriterion("ext_5 is not null"); + return (Criteria) this; + } + + public Criteria andExt5EqualTo(String value) { + addCriterion("ext_5 =", value, "ext5"); + return (Criteria) this; + } + + public Criteria andExt5NotEqualTo(String value) { + addCriterion("ext_5 <>", value, "ext5"); + return (Criteria) this; + } + + public Criteria andExt5GreaterThan(String value) { + addCriterion("ext_5 >", value, "ext5"); + return (Criteria) this; + } + + public Criteria andExt5GreaterThanOrEqualTo(String value) { + addCriterion("ext_5 >=", value, "ext5"); + return (Criteria) this; + } + + public Criteria andExt5LessThan(String value) { + addCriterion("ext_5 <", value, "ext5"); + return (Criteria) this; + } + + public Criteria andExt5LessThanOrEqualTo(String value) { + addCriterion("ext_5 <=", value, "ext5"); + return (Criteria) this; + } + + public Criteria andExt5Like(String value) { + addCriterion("ext_5 like", value, "ext5"); + return (Criteria) this; + } + + public Criteria andExt5NotLike(String value) { + addCriterion("ext_5 not like", value, "ext5"); + return (Criteria) this; + } + + public Criteria andExt5In(List values) { + addCriterion("ext_5 in", values, "ext5"); + return (Criteria) this; + } + + public Criteria andExt5NotIn(List values) { + addCriterion("ext_5 not in", values, "ext5"); + return (Criteria) this; + } + + public Criteria andExt5Between(String value1, String value2) { + addCriterion("ext_5 between", value1, value2, "ext5"); + return (Criteria) this; + } + + public Criteria andExt5NotBetween(String value1, String value2) { + addCriterion("ext_5 not between", value1, value2, "ext5"); + return (Criteria) this; + } + + public Criteria andExt6IsNull() { + addCriterion("ext_6 is null"); + return (Criteria) this; + } + + public Criteria andExt6IsNotNull() { + addCriterion("ext_6 is not null"); + return (Criteria) this; + } + + public Criteria andExt6EqualTo(String value) { + addCriterion("ext_6 =", value, "ext6"); + return (Criteria) this; + } + + public Criteria andExt6NotEqualTo(String value) { + addCriterion("ext_6 <>", value, "ext6"); + return (Criteria) this; + } + + public Criteria andExt6GreaterThan(String value) { + addCriterion("ext_6 >", value, "ext6"); + return (Criteria) this; + } + + public Criteria andExt6GreaterThanOrEqualTo(String value) { + addCriterion("ext_6 >=", value, "ext6"); + return (Criteria) this; + } + + public Criteria andExt6LessThan(String value) { + addCriterion("ext_6 <", value, "ext6"); + return (Criteria) this; + } + + public Criteria andExt6LessThanOrEqualTo(String value) { + addCriterion("ext_6 <=", value, "ext6"); + return (Criteria) this; + } + + public Criteria andExt6Like(String value) { + addCriterion("ext_6 like", value, "ext6"); + return (Criteria) this; + } + + public Criteria andExt6NotLike(String value) { + addCriterion("ext_6 not like", value, "ext6"); + return (Criteria) this; + } + + public Criteria andExt6In(List values) { + addCriterion("ext_6 in", values, "ext6"); + return (Criteria) this; + } + + public Criteria andExt6NotIn(List values) { + addCriterion("ext_6 not in", values, "ext6"); + return (Criteria) this; + } + + public Criteria andExt6Between(String value1, String value2) { + addCriterion("ext_6 between", value1, value2, "ext6"); + return (Criteria) this; + } + + public Criteria andExt6NotBetween(String value1, String value2) { + addCriterion("ext_6 not between", value1, value2, "ext6"); + 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/model/GasPayPriceModel.java b/hai-service/src/main/java/com/hai/model/GasPayPriceModel.java index 3807cb91..ba326f38 100644 --- a/hai-service/src/main/java/com/hai/model/GasPayPriceModel.java +++ b/hai-service/src/main/java/com/hai/model/GasPayPriceModel.java @@ -1,11 +1,14 @@ package com.hai.model; +import lombok.Data; + import java.math.BigDecimal; /** * 团购支付价格模型 * @author hurui */ +@Data public class GasPayPriceModel { /** @@ -73,107 +76,4 @@ public class GasPayPriceModel { */ private BigDecimal payPrice; - public BigDecimal getPreferentialMargin() { - return preferentialMargin; - } - - public void setPreferentialMargin(BigDecimal preferentialMargin) { - this.preferentialMargin = preferentialMargin; - } - - public BigDecimal getGasStationDrop() { - return gasStationDrop; - } - - public void setGasStationDrop(BigDecimal gasStationDrop) { - this.gasStationDrop = gasStationDrop; - } - - public BigDecimal getOilingPrice() { - return oilingPrice; - } - - public void setOilingPrice(BigDecimal oilingPrice) { - this.oilingPrice = oilingPrice; - } - - 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 BigDecimal getPricePlatform() { - return pricePlatform; - } - - public void setPricePlatform(BigDecimal pricePlatform) { - this.pricePlatform = pricePlatform; - } - - public BigDecimal getOilLiters() { - return oilLiters; - } - - public void setOilLiters(BigDecimal oilLiters) { - this.oilLiters = oilLiters; - } - - public BigDecimal getDiscount() { - return discount; - } - - public void setDiscount(BigDecimal discount) { - this.discount = discount; - } - - public BigDecimal getLitersPreferences() { - return litersPreferences; - } - - public void setLitersPreferences(BigDecimal litersPreferences) { - this.litersPreferences = litersPreferences; - } - - public BigDecimal getPricePreferences() { - return pricePreferences; - } - - public void setPricePreferences(BigDecimal pricePreferences) { - this.pricePreferences = pricePreferences; - } - - public BigDecimal getTotalPreferences() { - return totalPreferences; - } - - public void setTotalPreferences(BigDecimal totalPreferences) { - this.totalPreferences = totalPreferences; - } - - public BigDecimal getPayPrice() { - return payPrice; - } - - public void setPayPrice(BigDecimal payPrice) { - this.payPrice = payPrice; - } } diff --git a/hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java b/hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java index 1f25c01e..38ce4ee2 100644 --- a/hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java +++ b/hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java @@ -38,7 +38,7 @@ public interface OrderCreateHandleService { * @param createOrderChild 子订单参数 * @return */ - HighChildOrder oilHandle(HighOrder order,HighDiscountUserRel discountUserRel, CreateOrderChildModel createOrderChild); + HighChildOrder oilHandle(HighOrder order,HighDiscountUserRel discountUserRel, CreateOrderChildModel createOrderChild) throws Exception; /** * 优惠券包校验 diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java index fa00a2f1..5098915e 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java @@ -9,8 +9,14 @@ import com.hai.common.security.UserCenter; import com.hai.common.utils.IDGenerator; import com.hai.config.HuiLianTongConfig; import com.hai.config.HuiLianTongUnionCardConfig; +import com.hai.config.JinZhuJiaYouService; import com.hai.entity.*; import com.hai.enum_type.GasClassGroupTaskStatus; +import com.hai.enum_type.JinZhuJiaYouOilNo; +import com.hai.enum_type.MerAccountMarketingType; +import com.hai.enum_type.MerchantStoreSourceType; +import com.hai.model.GasPayPriceModel; +import com.hai.model.HighMerchantModel; import com.hai.model.ResponseData; import com.hai.order.model.CreateOrderChildModel; import com.hai.order.service.OrderCreateHandleService; @@ -18,6 +24,7 @@ import com.hai.order.service.OrderService; import com.hai.order.service.OrderServiceExt; import com.hai.order.type.OrderChildGoodsType; import com.hai.order.type.OrderChildStatus; +import com.hai.order.utils.OrderUtil; import com.hai.service.*; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -59,12 +66,33 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { @Resource private HighMerchantStoreService storeService; + @Resource + private HighMerchantService merchantService; + @Resource private HighDiscountCouponRelService discountCouponRelService; @Resource private HighCouponHandselService highCouponHandselService; + @Resource + private HighMerchantAccountMarketingService merchantAccountMarketingService; + + @Resource + private HighGasClassGroupTaskService gasClassGroupTaskService; + + @Resource + private HighGasStaffService gasStaffService; + + @Resource + private HighGasDiscountOilPriceService gasDiscountOilPriceService; + + @Resource + private HighTyAgentOilStationService gasTyAgentOilStationService; + + @Resource + private JinZhuJiaYouService gasJinZhuJiaYouService; + @Override public List couponHandle(HighDiscountUserRel discountUserRel, CreateOrderChildModel createOrderChild) throws Exception { if (createOrderChild.getSaleCount() != 1) { @@ -96,7 +124,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { } // 生成子订单编号 - String childOrderNo = generateChildOrderNo(); + String childOrderNo = OrderUtil.generateChildOrderNo(); // 如果不是来源不是贵州中石化，需要校验库存 if (!coupon.getCouponSource().equals(4)) { @@ -166,7 +194,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { if (handselCoupon == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_COUPON, ""); } - String handselChildOrderNo = generateChildOrderNo(); + String handselChildOrderNo = OrderUtil.generateChildOrderNo(); // 赠送卡卷是否有库存，没有就不赠送 if (couponService.assignOrderStock(handselCoupon.getId(), handselChildOrderNo) != null) { @@ -202,7 +230,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到用户信息"); } HighChildOrder childOrder = new HighChildOrder(); - childOrder.setChildOrderNo(generateChildOrderNo()); + childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo()); childOrder.setGoodsType(OrderChildGoodsType.TYPE1.getNumber()); childOrder.setGoodsId(user.getId()); childOrder.setGoodsName(user.getName()); @@ -220,13 +248,12 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { } @Override - public HighChildOrder oilHandle(HighOrder order,HighDiscountUserRel discountUserRel, CreateOrderChildModel createOrderChild) { + public HighChildOrder oilHandle(HighOrder order,HighDiscountUserRel discountUserRel, CreateOrderChildModel createOrderChild) throws Exception { // 查询油品类型 SecDictionary gasOilType = commonService.mappingSysCode("GAS_OIL_TYPE", createOrderChild.getGasOilNo()); if (gasOilType == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知油品类型"); } - // 加油限制 if (gasOilType.getExt1().equals("1")) { SecDictionary refuelLimit = commonService.mappingSysName("REFUEL_LIMIT", "汽油"); @@ -239,7 +266,125 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "柴油加油金额不能超过" + refuelLimit.getCodeValue()+"元"); } } + // 查询油站 + HighMerchantStore store = storeService.getDetailById(createOrderChild.getGoodsId()); + if (store == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的油站"); + } + // 查询商户 + HighMerchant merchant = merchantService.getDetailById(store.getMerchantId()); + if (merchant == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的油站"); + } + + // 营销减免的金额 + BigDecimal marketingPrice = merchantAccountMarketingService.getPrice(store.getMerchantId(), MerAccountMarketingType.type3.getType(), Integer.valueOf(createOrderChild.getGasOilNo())); + // 计算价格 + GasPayPriceModel priceModel = gasDiscountOilPriceService.oilPriceDiscountCompute(createOrderChild.getGoodsPrice(), createOrderChild.getGoodsId(), createOrderChild.getGasOilNo(), createOrderChild.getIsTyAgent()); + + // 生成交易子订单 + HighChildOrder childOrder = new HighChildOrder(); + childOrder.setOrderNo(order.getOrderNo()); + childOrder.setMemId(createOrderChild.getMemId()); + childOrder.setMemName(createOrderChild.getMemName()); + childOrder.setMemPhone(createOrderChild.getMemPhone()); + childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo()); + childOrder.setGoodsType(OrderChildGoodsType.TYPE3.getNumber()); + childOrder.setGoodsId(store.getId()); + childOrder.setGoodsName(store.getStoreName()); + childOrder.setGoodsImg(store.getStoreLogo()); + childOrder.setGoodsSpecName("默认"); + childOrder.setGoodsPrice(priceModel.getOilLiters()); + childOrder.setGoodsActualPrice(priceModel.getPayPrice()); + childOrder.setSaleCount(createOrderChild.getSaleCount()); + childOrder.setGiveawayType(false); + childOrder.setChildOrderStatus(OrderChildStatus.STATUS1.getNumber()); + childOrder.setTotalPrice(new BigDecimal(childOrder.getSaleCount().toString()).multiply(childOrder.getGoodsPrice())); + childOrder.setTotalActualPrice(new BigDecimal(childOrder.getSaleCount().toString()).multiply(childOrder.getGoodsActualPrice())); + childOrder.setSurplusRefundNum(childOrder.getSaleCount()); + childOrder.setSurplusRefundPrice(new BigDecimal("0")); + childOrder.setSurplusRefundIntegral(0); + childOrder.setPraiseStatus(0); + childOrder.setCreateTime(new Date()); + + // 生成加油订单 + HighGasOrder gasOrder = new HighGasOrder(); + gasOrder.setOrderNo(order.getOrderNo()); + gasOrder.setChildOrderNo(createOrderChild.getOrderNo()); + gasOrder.setMemId(childOrder.getMemId()); + gasOrder.setMemPhone(childOrder.getMemPhone()); + gasOrder.setMerId(store.getMerchantId()); + gasOrder.setMerName(merchant.getMerchantName()); + gasOrder.setStoreId(store.getId()); + gasOrder.setStoreName(store.getStoreName()); + gasOrder.setGasOilNo(createOrderChild.getGasOilNo()); + gasOrder.setGasGunNo(createOrderChild.getGasGunNo()); + gasOrder.setGasOilType(Integer.parseInt(gasOilType.getExt1())); + + // 使用了优惠价 + if (discountUserRel != null) { + // 支付价格 + childOrder.setGoodsActualPrice(childOrder.getGoodsPrice()); + // 油价信息 + gasOrder.setGasRefuelPrice(childOrder.getGoodsPrice()); + gasOrder.setGasPriceGun(priceModel.getPriceGun()); + gasOrder.setGasPriceVip(priceModel.getPriceGun()); + gasOrder.setGasPriceOfficial(new BigDecimal("0")); + gasOrder.setGasPricePlatform(priceModel.getPriceGun()); + gasOrder.setGasOilLiters(priceModel.getOilLiters()); + gasOrder.setGasDiscount(new BigDecimal("0")); + gasOrder.setGasOilSubsidy(new BigDecimal("0")); + gasOrder.setGasLitersPreferences(new BigDecimal("0")); + gasOrder.setGasPricePreferences(priceModel.getPriceGun()); + } else { + // 支付价格 + childOrder.setGoodsActualPrice(priceModel.getPayPrice()); + // 油价信息 + gasOrder.setGasRefuelPrice(childOrder.getGoodsPrice()); + gasOrder.setGasPriceGun(priceModel.getPriceGun()); + gasOrder.setGasPriceVip(priceModel.getPriceVip()); + gasOrder.setGasPriceOfficial(priceModel.getPriceOfficial()); + gasOrder.setGasPricePlatform(priceModel.getPricePlatform()); + gasOrder.setGasOilLiters(priceModel.getOilLiters()); + gasOrder.setGasDiscount(priceModel.getDiscount()); + gasOrder.setGasOilSubsidy(priceModel.getPreferentialMargin()); + gasOrder.setGasLitersPreferences(priceModel.getLitersPreferences()); + gasOrder.setGasPricePreferences(priceModel.getPricePreferences()); + } + + if (store.getSourceType().equals(MerchantStoreSourceType.type4.getNumber())) { + // 查询金猪油品数据 + JinZhuJiaYouOilNo jzOilNo = JinZhuJiaYouOilNo.getDataByOilNo(Integer.valueOf(gasOrder.getGasOilNo())); + if (jzOilNo == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法提交订单，未知的油品"); + } + // 请求金猪接口 - 创建金猪订单 + JSONObject jzOrderObject = gasJinZhuJiaYouService.createOrder(gasOrder.getOrderNo(), + gasOrder.getGasRefuelPrice(), + store.getStoreKey(), + jzOilNo.getOilNoCode(), + gasOrder.getGasGunNo(), + gasOrder.getMemPhone() + ); + gasOrder.setChannelOrderNo(jzOrderObject.getJSONObject("data").getString("systemOrderNo")); + gasOrder.setGasPriceChannelPay(jzOrderObject.getJSONObject("data").getBigDecimal("paymentAmount")); + } + + if (createOrderChild.getIsTyAgent() != null && createOrderChild.getIsTyAgent().equals(true)) { + // 查询加油站 + HighTyAgentOilStation oilStation = gasTyAgentOilStationService.getDetailByOilStationId(createOrderChild.getGoodsId()); + if (oilStation != null) { + gasOrder.setGasSalesmanId(oilStation.getTySalesmanId()); + gasOrder.setGasSalesmanName(oilStation.getTySalesmanName()); + gasOrder.setGasAgentId(oilStation.getTyAgentId()); + gasOrder.setGasAgentName(oilStation.getTyAgentName()); + gasOrder.setGasOrgId(oilStation.getOrganizationId()); + gasOrder.setGasOrgName(oilStation.getOrganizationName()); + } + } + + // 加油员 if (StringUtils.isNotBlank(createOrderChild.getGasStaffCode())) { String qrCodeSignKey = commonService.getDictionaryCodeName("QR_CODE_SIGN_KEY", "1"); if (StringUtils.isBlank(qrCodeSignKey)) { @@ -249,35 +394,29 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { try { staffId = AESEncodeUtil.aesDecryptByBytes(AESEncodeUtil.base64Decode(URLDecoder.decode(createOrderChild.getGasStaffCode(),"UTF-8")), qrCodeSignKey); } catch (Exception e) { - log.error("HighOrderController --> addOrder() error!", "收银员code解析失败"); + log.error("HighOrderController --> addOrder() error!", "加油员code解析失败"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "收银员code解析失败"); } -/* // 查询员工 + // 查询员工 HighGasStaff gasStaff = gasStaffService.getStaffDetailById(Long.parseLong(staffId)); if (gasStaff == null) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知收银员"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知加油员"); } if (gasStaff.getMerchantStoreId().equals(childOrder.getGoodsId())) { - childOrder.setGasStaffId(gasStaff.getId()); - childOrder.setGasStaffName(gasStaff.getName()); - }*/ - + gasOrder.setGasStaffId(gasStaff.getId()); + gasOrder.setGasStaffName(gasStaff.getName()); + } } + // 查询加油站是否开启班组 + HighGasClassGroupTask groupTask = gasClassGroupTaskService.getCurrentTaskByStoreId(gasOrder.getStoreId()); + if (groupTask != null) { + gasOrder.setGasClassGroupId(groupTask.getGasClassGroupId()); + gasOrder.setGasClassGroupName(groupTask.getGasClassGroupName()); + gasOrder.setGasClassGroupTaskId(groupTask.getId()); + } - /* // 查询加油站是否开启班组 - Map classGroup = new HashMap<>(); - classGroup.put("merchantStoreId", createOrderChild.getGoodsId()); - classGroup.put("status", GasClassGroupTaskStatus.status1.getStatus()); - List groupTaskList = gasClassGroupTaskService.getGroupTaskList(classGroup); - if (groupTaskList.size() > 0) { - HighGasClassGroupTask groupTask = groupTaskList.get(0); - childOrder.setGasClassGroupId(groupTask.getGasClassGroupId()); - childOrder.setGasClassGroupName(groupTask.getGasClassGroupName()); - childOrder.setGasClassGroupTaskId(groupTask.getId()); - }*/ - - return null; + return childOrder; } @Override @@ -290,13 +429,4 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { return null; } - /** - * 生成子订单号 - * @return - * @throws Exception - */ - public static String generateChildOrderNo() { - // 生成子订单号 - return IDGenerator.nextId(16); - } } diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderPayServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderPayServiceImpl.java index a93c4fe0..4b79104f 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderPayServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderPayServiceImpl.java @@ -20,6 +20,7 @@ import com.hai.order.type.OrderProductType; import com.hai.order.type.OrderStatus; import com.hai.service.HighOilCardService; import com.hai.service.HighUserCardService; +import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; @@ -31,6 +32,7 @@ import java.util.Map; * @author: HuRui * @date: 2022/9/5 **/ +@Service("orderPayService") public class OrderPayServiceImpl implements OrderPayService { @Resource diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java index 695d3c9e..778fa407 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java @@ -341,6 +341,7 @@ public class OrderServiceImpl implements OrderService { // 订单入库 HighOrder orderData = insertOrderData(order); + if (orderData.getOrderStatus().equals(OrderStatus.STATUS1.getNumber())) { // 10分钟后取消订单 Message rocketMsg = MessageBuilder.withPayload(order).build(); @@ -519,6 +520,10 @@ public class OrderServiceImpl implements OrderService { criteria.andMemIdEqualTo(MapUtils.getLong(param, "userId")); } + if (StringUtils.isNotBlank(MapUtils.getString(param, "orderNo"))) { + criteria.andOrderNoLike("%" + MapUtils.getString(param, "orderNo") + "%"); + } + if (MapUtils.getInteger(param, "productType") != null) { criteria.andProductTypeEqualTo(MapUtils.getInteger(param, "productType")); } diff --git a/hai-service/src/main/java/com/hai/order/utils/OrderUtil.java b/hai-service/src/main/java/com/hai/order/utils/OrderUtil.java index 14e5b10b..abac6f7f 100644 --- a/hai-service/src/main/java/com/hai/order/utils/OrderUtil.java +++ b/hai-service/src/main/java/com/hai/order/utils/OrderUtil.java @@ -49,6 +49,17 @@ public class OrderUtil { return DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + randomNum; } + + /** + * 生成子订单号 + * @return + * @throws Exception + */ + public static String generateChildOrderNo() { + // 生成子订单号 + return IDGenerator.nextId(16); + } + /** * 生成退款订单号 * @return diff --git a/hai-service/src/main/java/com/hai/service/HighGasClassGroupTaskService.java b/hai-service/src/main/java/com/hai/service/HighGasClassGroupTaskService.java index f0981183..bae31400 100644 --- a/hai-service/src/main/java/com/hai/service/HighGasClassGroupTaskService.java +++ b/hai-service/src/main/java/com/hai/service/HighGasClassGroupTaskService.java @@ -2,6 +2,7 @@ package com.hai.service; import com.alibaba.fastjson.JSONObject; import com.hai.entity.HighGasClassGroupTask; +import com.hai.entity.HighGasOrder; import com.hai.model.GasClassGroupTaskDataCount; import java.util.Date; @@ -61,4 +62,11 @@ public interface HighGasClassGroupTaskService { */ List getGroupTaskList(Map param); + /** + * 跟油站 获取当前班组任务 + * @param storeId + * @return + */ + HighGasClassGroupTask getCurrentTaskByStoreId(Long storeId); + } diff --git a/hai-service/src/main/java/com/hai/service/HighGasOrderService.java b/hai-service/src/main/java/com/hai/service/HighGasOrderService.java new file mode 100644 index 00000000..5df0afd9 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/HighGasOrderService.java @@ -0,0 +1,27 @@ +package com.hai.service; + +import com.hai.entity.HighGasOrder; + +/** + * 加油订单 + * @className: HighGasOrderService + * @author: HuRui + * @date: 2022/9/6 + **/ +public interface HighGasOrderService { + + /** + * 增加订单 + * @param gasOrder + */ + void addGasOrder(HighGasOrder gasOrder); + + /** + * 修改订单 + * @param gasOrder + */ + void updateGasOrder(HighGasOrder gasOrder); + + + +} diff --git a/hai-service/src/main/java/com/hai/service/impl/HighGasClassGroupTaskServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighGasClassGroupTaskServiceImpl.java index 3a751d36..1cda9ab6 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighGasClassGroupTaskServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighGasClassGroupTaskServiceImpl.java @@ -219,4 +219,17 @@ public class HighGasClassGroupTaskServiceImpl implements HighGasClassGroupTaskSe example.setOrderByClause("create_time desc"); return gasClassGroupTaskMapper.selectByExample(example); } + + @Override + public HighGasClassGroupTask getCurrentTaskByStoreId(Long storeId) { + HighGasClassGroupTaskExample example = new HighGasClassGroupTaskExample(); + example.createCriteria() + .andMerchantStoreIdEqualTo(storeId) + .andStatusEqualTo(GasClassGroupTaskStatus.status1.getStatus()); + List list = gasClassGroupTaskMapper.selectByExample(example); + if (list.size() > 0) { + return list.get(0); + } + return null; + } } 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 index 0a6a0a9f..457921b0 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighGasDiscountOilPriceServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighGasDiscountOilPriceServiceImpl.java @@ -7,10 +7,7 @@ import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; import com.hai.config.TuanYouConfig; import com.hai.dao.HighGasDiscountOilPriceMapper; -import com.hai.entity.HighGasDiscountOilPrice; -import com.hai.entity.HighGasDiscountOilPriceExample; -import com.hai.entity.HighGasOilPrice; -import com.hai.entity.HighTyAgentPrice; +import com.hai.entity.*; import com.hai.enum_type.MerchantStoreSourceType; import com.hai.model.GasPayPriceModel; import com.hai.model.HighMerchantStoreModel; @@ -103,7 +100,7 @@ public class HighGasDiscountOilPriceServiceImpl implements HighGasDiscountOilPri @Override public GasPayPriceModel oilPriceDiscountCompute(BigDecimal oilingPrice, Long goodsId, String oilNo, Boolean isTyAgent) throws Exception { // 查询油站信息 - HighMerchantStoreModel store = merchantStoreService.getMerchantStoreById(goodsId); + HighMerchantStore store = merchantStoreService.getDetailById(goodsId); if (store == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到油站"); } @@ -115,25 +112,26 @@ public class HighGasDiscountOilPriceServiceImpl implements HighGasDiscountOilPri // 优惠比例 BigDecimal discount = new BigDecimal("100"); - // 查询是否配置了【油站的】优惠比例 - HighTyAgentPrice tyAgentPrice = tyAgentPriceService.getDetail(1, goodsId, oilNo); - if (tyAgentPrice != null) { - discount = tyAgentPrice.getPriceRate(); - } else { - // 查询是否配置了【油品】优惠比例 - HighGasDiscountOilPrice gasDiscountOilPrice = gasDiscountOilPriceService.getDetailByOilNo(oilNo); - if (gasDiscountOilPrice != null) { - discount = gasDiscountOilPrice.getPriceRate(); - } - } - if (isTyAgent != null && isTyAgent.equals(true)) { // 价格 HighTyAgentPrice priceRate = tyAgentPriceService.getDetail(2, goodsId, oilNo); if (priceRate != null) { discount = priceRate.getPriceRate(); } + } else { + // 查询是否配置了【油站的】优惠比例 + HighTyAgentPrice tyAgentPrice = tyAgentPriceService.getDetail(1, goodsId, oilNo); + if (tyAgentPrice != null) { + discount = tyAgentPrice.getPriceRate(); + } else { + // 查询是否配置了【油品】优惠比例 + HighGasDiscountOilPrice gasDiscountOilPrice = gasDiscountOilPriceService.getDetailByOilNo(oilNo); + if (gasDiscountOilPrice != null) { + discount = gasDiscountOilPrice.getPriceRate(); + } + } } + discount = discount.divide(new BigDecimal("100")); // 查询油站价格 diff --git a/hai-service/src/main/java/com/hai/service/impl/HighGasOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighGasOrderServiceImpl.java new file mode 100644 index 00000000..f46f37bf --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/impl/HighGasOrderServiceImpl.java @@ -0,0 +1,32 @@ +package com.hai.service.impl; + +import com.hai.dao.HighGasOrderMapper; +import com.hai.entity.HighGasOrder; +import com.hai.service.HighGasOrderService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; + +/** + * @className: HighGasOrderServiceImpl + * @author: HuRui + * @date: 2022/9/6 + **/ +@Service("gasOrderService") +public class HighGasOrderServiceImpl implements HighGasOrderService { + + @Resource + private HighGasOrderMapper gasOrderMapper; + + @Override + public void addGasOrder(HighGasOrder gasOrder) { + gasOrder.setCreateTime(new Date()); + gasOrderMapper.insert(gasOrder); + } + + @Override + public void updateGasOrder(HighGasOrder gasOrder) { + gasOrderMapper.updateByPrimaryKeySelective(gasOrder); + } +}