hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'提交代码'

Browse Source
dev-discount
= 3 years ago
parent e97ae4783a
commit 74068c0870
8 changed files with 493 additions and 12 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 62
      hai-cweb/src/main/java/com/cweb/controller/HighGasController.java
  2. 54
      hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java
  3. 60
      hai-cweb/src/main/java/com/cweb/controller/pay/TuanYouController.java
  4. 21
      hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
  5. 42
      hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
  6. 6
      hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapperExt.java
  7. 50
      hai-service/src/main/java/com/hai/entity/HighChildOrder.java
  8. 210
      hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java

62
hai-cweb/src/main/java/com/cweb/controller/HighGasController.java
Unescape View File

@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@ -74,11 +75,16 @@ public class HighGasController {
@RequestMapping(value="/getGasDetailByStoreKey",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "根据门店key 查询")
public ResponseData getGasDetailByStoreKey(@RequestParam(name = "storeKey", required = true) String storeKey) {
public ResponseData getGasDetailByStoreKey(@RequestParam(name = "storeKey", required = true) String storeKey,
@RequestParam(name = "longitude", required = true) String longitude,
@RequestParam(name = "latitude", required = true) String latitude) {
try {
JSONObject jsonObject = TuanYouConfig.queryGasInfoByGasId(storeKey);
if (jsonObject != null && jsonObject.getString("code").equals("200")) {
JSONObject result = jsonObject.getJSONObject("result");
double distance = CoordCommonUtil.getDistance(Double.valueOf(result.get("gasAddressLatitude").toString()), Double.valueOf(result.get("gasAddressLongitude").toString()), Double.valueOf(latitude), Double.valueOf(longitude));
result.put("distance", Math.round(distance/100d)/10d);
return ResponseMsgUtil.success(jsonObject.get("result"));
}
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未获取到加油站信息");
@ -111,4 +117,58 @@ public class HighGasController {
}
}
@RequestMapping(value="/refuelingOrderPush",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "推送订单")
public ResponseData refuelingOrderPush() {
try {
Map<String,Object> map = new HashMap<>();
map.put("gasId", "CS000116576");
map.put("oilNo", "92");
map.put("gunNo", 1);
BigDecimal priceGun = new BigDecimal("6");
BigDecimal priceVip = new BigDecimal("4.9");
//BigDecimal priceGun = new BigDecimal("5.58");
//BigDecimal priceVip = new BigDecimal("5.58");
map.put("priceGun", priceGun); // 枪单价
map.put("priceVip", priceVip); // 优惠价
map.put("driverPhone", "17726395120");
map.put("thirdSerialNo", new Date().getTime());
BigDecimal refuelingAmount = new BigDecimal("1200").divide(priceGun,2,BigDecimal.ROUND_HALF_UP).multiply(priceVip).setScale(2,BigDecimal.ROUND_HALF_UP);
map.put("refuelingAmount", refuelingAmount);
JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(map);
if (orderPushObject == null || !orderPushObject.getString("code").equals("200")) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "提交订单，出现了未知错误");
}
JSONObject result = orderPushObject.getJSONObject("result");
return ResponseMsgUtil.success(result.getString("orderNo"));
//return ResponseMsgUtil.success(map);
} catch (Exception e) {
log.error("HighGasController -> refuelingOrderPush() error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/queryThirdOrderDretail",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "推送订单")
public ResponseData queryThirdOrderDretail() {
try {
return ResponseMsgUtil.success(TuanYouConfig.queryThirdOrderDretail("1624541593196"));
//return ResponseMsgUtil.success(map);
} catch (Exception e) {
log.error("HighGasController -> queryThirdOrderDretail() error!",e);
return ResponseMsgUtil.exception(e);
}
}
}

54
hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java
Unescape View File

@ -1,5 +1,7 @@
package com.cweb.controller;
import com.alibaba.fastjson.JSONObject;
import com.cweb.config.TuanYouConfig;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hai.common.exception.ErrorCode;
@ -12,11 +14,13 @@ import com.hai.common.utils.IDGenerator;
import com.hai.common.utils.ResponseMsgUtil;
import com.hai.entity.*;
import com.hai.model.HighCouponModel;
import com.hai.model.HighMerchantStoreModel;
import com.hai.model.HighUserModel;
import com.hai.model.ResponseData;
import com.hai.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -49,6 +53,9 @@ public class HighOrderController {
@Resource
private HighCouponService highCouponService;
@Resource
private HighMerchantStoreService highMerchantStoreService;
@Resource
private HighCouponCodeService highCouponCodeService;
@ -94,7 +101,7 @@ public class HighOrderController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
// 商品类型 1:卡卷 2:金币充值
// 商品类型 1:卡卷 2:金币充值 3:团油【加油站】
if (childOrder.getGoodsType() == 1) {
if (childOrder.getSaleCount() != 1) {
log.error("HighOrderController --> addOrder() error!", "卡卷只能购买一张");
@ -157,6 +164,51 @@ public class HighOrderController {
childOrder.setGoodsSpecName("默认");
}
if (childOrder.getGoodsType() == 3) {
if (childOrder.getGoodsPrice() == null || StringUtils.isBlank(childOrder.getGasGunNo()) || StringUtils.isBlank(childOrder.getGasOilNo())) {
log.error("HighOrderController --> addOrder() error!", "参数错误");
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
// 查询门店
HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(childOrder.getId());
if (store == null) {
log.error("HighOrderController --> addOrder() error!", "未找到门店信息");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到门店信息");
}
childOrder.setGoodsName(store.getStoreName());
childOrder.setGoodsImg(store.getStoreLogo());
childOrder.setGoodsSpecName("默认");
childOrder.setTotalPrice(childOrder.getGoodsPrice().multiply(new BigDecimal(childOrder.getSaleCount().toString())));
// 获取当前加油价格
JSONObject jsonObject = TuanYouConfig.queryCompanyPriceDetail(store.getStoreKey(), childOrder.getGasOilNo());
if (jsonObject == null || !jsonObject.getString("code").equals("200")) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未获取到加油价格");
}
if(jsonObject.getJSONArray("result").size() == 0) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未获取到加油价格");
}
JSONObject priceDetail = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.getJSONArray("result").get(0)), JSONObject.class);
// 推送订单
Map<String,Object> map = new HashMap<>();
map.put("gasId", store.getStoreKey());
map.put("oilNo", childOrder.getGasOilNo());
map.put("gunNo", childOrder.getGasGunNo());
BigDecimal priceGun = new BigDecimal(priceDetail.getString("priceGun"));
BigDecimal priceVip = new BigDecimal(priceDetail.getString("priceVip"));
map.put("priceGun", priceGun); // 枪单价
map.put("priceVip", priceVip); // 优惠价
map.put("driverPhone", userInfoModel.getHighUser().getPhone());
map.put("thirdSerialNo", highOrder.getOrderNo());
BigDecimal refuelingAmount = new BigDecimal(childOrder.getTotalPrice().toString()).divide(priceGun,2,BigDecimal.ROUND_HALF_UP).multiply(priceVip).setScale(2,BigDecimal.ROUND_HALF_UP);
map.put("refuelingAmount", refuelingAmount);
JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(map);
if (orderPushObject == null || !orderPushObject.getString("code").equals("200")) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "提交订单，出现了未知错误");
}
childOrder.setGasOrderNo(orderPushObject.getJSONObject("result").getString("orderNo"));
}
childOrder.setMemId(userInfoModel.getHighUser().getId());
childOrder.setTotalPrice(childOrder.getGoodsPrice().multiply(new BigDecimal(childOrder.getSaleCount().toString())));
childOrder.setGiveawayType(false); // 是否是赠品 0：否 1：是

60
hai-cweb/src/main/java/com/cweb/controller/pay/TuanYouController.java
Unescape View File

@ -0,0 +1,60 @@
package com.cweb.controller.pay;
import com.alibaba.fastjson.JSONObject;
import com.cweb.config.SysConst;
import com.hai.common.pay.WechatPayUtil;
import com.hai.common.pay.util.IOUtil;
import com.hai.common.pay.util.XmlUtil;
import com.hai.common.pay.util.sdk.WXPayConstants;
import com.hai.common.utils.HttpsUtils;
import com.hai.common.utils.ResponseMsgUtil;
import com.hai.common.utils.WxUtils;
import com.hai.model.ResponseData;
import com.hai.model.WxSharingReceiversVO;
import com.hai.service.HighProfitSharingRecordService;
import com.hai.service.TelApiService;
import com.hai.service.pay.NotifyService;
import com.hai.service.pay.PayRecordService;
import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedOutputStream;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.UnsupportedEncodingException;
import java.security.*;
import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
import java.util.SortedMap;
@Controller
@RequestMapping(value = "/ty")
@Api(value = "团油回调")
public class TuanYouController {
private static Logger log = LoggerFactory.getLogger(TuanYouController.class);
@RequestMapping(value = "/orderPaymentNotify", method = RequestMethod.POST)
@ApiOperation(value = "订单支付回调")
public void orderPaymentNotify(HttpServletRequest request, HttpServletResponse response) {
try {
} catch (Exception e) {
log.error("WechatPayController --> wechatNotify() error!", e);
}
}
}

21
hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
Unescape View File

@ -45,16 +45,18 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"goods_spec_name, goods_price, ",
"sale_count, total_price, ",
"giveaway_type, child_orde_status, ",
"praise_status, ext_1, ",
"ext_2, ext_3)",
"praise_status, gas_oil_no, ",
"gas_gun_no, gas_order_no, ",
"ext_1, ext_2, ext_3)",
"values (#{orderId,jdbcType=BIGINT}, #{memId,jdbcType=BIGINT}, ",
"#{goodsType,jdbcType=INTEGER}, #{goodsId,jdbcType=BIGINT}, ",
"#{goodsName,jdbcType=VARCHAR}, #{goodsImg,jdbcType=VARCHAR}, ",
"#{goodsSpecName,jdbcType=VARCHAR}, #{goodsPrice,jdbcType=DECIMAL}, ",
"#{saleCount,jdbcType=INTEGER}, #{totalPrice,jdbcType=DECIMAL}, ",
"#{giveawayType,jdbcType=BIT}, #{childOrdeStatus,jdbcType=INTEGER}, ",
"#{praiseStatus,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, ",
"#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
"#{praiseStatus,jdbcType=INTEGER}, #{gasOilNo,jdbcType=VARCHAR}, ",
"#{gasGunNo,jdbcType=VARCHAR}, #{gasOrderNo,jdbcType=VARCHAR}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(HighChildOrder record);
@ -79,6 +81,9 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
@Result(column="giveaway_type", property="giveawayType", jdbcType=JdbcType.BIT),
@Result(column="child_orde_status", property="childOrdeStatus", jdbcType=JdbcType.INTEGER),
@Result(column="praise_status", property="praiseStatus", jdbcType=JdbcType.INTEGER),
@Result(column="gas_oil_no", property="gasOilNo", jdbcType=JdbcType.VARCHAR),
@Result(column="gas_gun_no", property="gasGunNo", jdbcType=JdbcType.VARCHAR),
@Result(column="gas_order_no", property="gasOrderNo", 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)
@ -89,7 +94,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"select",
"id, order_id, mem_id, goods_type, goods_id, goods_name, goods_img, goods_spec_name, ",
"goods_price, sale_count, total_price, giveaway_type, child_orde_status, praise_status, ",
"ext_1, ext_2, ext_3",
"gas_oil_no, gas_gun_no, gas_order_no, ext_1, ext_2, ext_3",
"from high_child_order",
"where id = #{id,jdbcType=BIGINT}"
})
@ -108,6 +113,9 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
@Result(column="giveaway_type", property="giveawayType", jdbcType=JdbcType.BIT),
@Result(column="child_orde_status", property="childOrdeStatus", jdbcType=JdbcType.INTEGER),
@Result(column="praise_status", property="praiseStatus", jdbcType=JdbcType.INTEGER),
@Result(column="gas_oil_no", property="gasOilNo", jdbcType=JdbcType.VARCHAR),
@Result(column="gas_gun_no", property="gasGunNo", jdbcType=JdbcType.VARCHAR),
@Result(column="gas_order_no", property="gasOrderNo", 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)
@ -138,6 +146,9 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"giveaway_type = #{giveawayType,jdbcType=BIT},",
"child_orde_status = #{childOrdeStatus,jdbcType=INTEGER},",
"praise_status = #{praiseStatus,jdbcType=INTEGER},",
"gas_oil_no = #{gasOilNo,jdbcType=VARCHAR},",
"gas_gun_no = #{gasGunNo,jdbcType=VARCHAR},",
"gas_order_no = #{gasOrderNo,jdbcType=VARCHAR},",
"ext_1 = #{ext1,jdbcType=VARCHAR},",
"ext_2 = #{ext2,jdbcType=VARCHAR},",
"ext_3 = #{ext3,jdbcType=VARCHAR}",

42
hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
Unescape View File

@ -80,6 +80,18 @@ public class HighChildOrderSqlProvider {
sql.VALUES("praise_status", "#{praiseStatus,jdbcType=INTEGER}");
}
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.getGasOrderNo() != null) {
sql.VALUES("gas_order_no", "#{gasOrderNo,jdbcType=VARCHAR}");
}
if (record.getExt1() != null) {
sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
}
@ -115,6 +127,9 @@ public class HighChildOrderSqlProvider {
sql.SELECT("giveaway_type");
sql.SELECT("child_orde_status");
sql.SELECT("praise_status");
sql.SELECT("gas_oil_no");
sql.SELECT("gas_gun_no");
sql.SELECT("gas_order_no");
sql.SELECT("ext_1");
sql.SELECT("ext_2");
sql.SELECT("ext_3");
@ -191,6 +206,18 @@ public class HighChildOrderSqlProvider {
sql.SET("praise_status = #{record.praiseStatus,jdbcType=INTEGER}");
}
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.getGasOrderNo() != null) {
sql.SET("gas_order_no = #{record.gasOrderNo,jdbcType=VARCHAR}");
}
if (record.getExt1() != null) {
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
}
@ -225,6 +252,9 @@ public class HighChildOrderSqlProvider {
sql.SET("giveaway_type = #{record.giveawayType,jdbcType=BIT}");
sql.SET("child_orde_status = #{record.childOrdeStatus,jdbcType=INTEGER}");
sql.SET("praise_status = #{record.praiseStatus,jdbcType=INTEGER}");
sql.SET("gas_oil_no = #{record.gasOilNo,jdbcType=VARCHAR}");
sql.SET("gas_gun_no = #{record.gasGunNo,jdbcType=VARCHAR}");
sql.SET("gas_order_no = #{record.gasOrderNo,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}");
@ -290,6 +320,18 @@ public class HighChildOrderSqlProvider {
sql.SET("praise_status = #{praiseStatus,jdbcType=INTEGER}");
}
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.getGasOrderNo() != null) {
sql.SET("gas_order_no = #{gasOrderNo,jdbcType=VARCHAR}");
}
if (record.getExt1() != null) {
sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
}

6
hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapperExt.java
Unescape View File

@ -1,11 +1,7 @@
package com.hai.dao;
import com.hai.entity.HighCouponRecycle;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.type.JdbcType;
import java.util.List;
import java.util.Map;
@ -18,6 +14,8 @@ public interface HighGasOilPriceMapperExt {
@Select("<script>" +
" SELECT" +
" a.oil_no_name," +
" a.price_gun," +
" a.price_vip," +
" b.* " +
" FROM" +
" high_gas_oil_price a," +

50
hai-service/src/main/java/com/hai/entity/HighChildOrder.java
Unescape View File

@ -29,7 +29,7 @@ public class HighChildOrder implements Serializable {
private Long memId;
/**
* 商品类型 1:卡卷
* 商品类型 1:卡卷 2:金币充值 3:团油【加油站】
*/
private Integer goodsType;
@ -83,6 +83,21 @@ public class HighChildOrder implements Serializable {
*/
private Integer praiseStatus;
/**
* 【加油站】油号
*/
private String gasOilNo;
/**
* 【加油站】油抢号
*/
private String gasGunNo;
/**
* 【加油站】订单号
*/
private String gasOrderNo;
private String ext1;
private String ext2;
@ -203,6 +218,30 @@ public class HighChildOrder implements Serializable {
this.praiseStatus = praiseStatus;
}
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 String getGasOrderNo() {
return gasOrderNo;
}
public void setGasOrderNo(String gasOrderNo) {
this.gasOrderNo = gasOrderNo;
}
public String getExt1() {
return ext1;
}
@ -253,6 +292,9 @@ public class HighChildOrder implements Serializable {
&& (this.getGiveawayType() == null ? other.getGiveawayType() == null : this.getGiveawayType().equals(other.getGiveawayType()))
&& (this.getChildOrdeStatus() == null ? other.getChildOrdeStatus() == null : this.getChildOrdeStatus().equals(other.getChildOrdeStatus()))
&& (this.getPraiseStatus() == null ? other.getPraiseStatus() == null : this.getPraiseStatus().equals(other.getPraiseStatus()))
&& (this.getGasOilNo() == null ? other.getGasOilNo() == null : this.getGasOilNo().equals(other.getGasOilNo()))
&& (this.getGasGunNo() == null ? other.getGasGunNo() == null : this.getGasGunNo().equals(other.getGasGunNo()))
&& (this.getGasOrderNo() == null ? other.getGasOrderNo() == null : this.getGasOrderNo().equals(other.getGasOrderNo()))
&& (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()));
@ -276,6 +318,9 @@ public class HighChildOrder implements Serializable {
result = prime * result + ((getGiveawayType() == null) ? 0 : getGiveawayType().hashCode());
result = prime * result + ((getChildOrdeStatus() == null) ? 0 : getChildOrdeStatus().hashCode());
result = prime * result + ((getPraiseStatus() == null) ? 0 : getPraiseStatus().hashCode());
result = prime * result + ((getGasOilNo() == null) ? 0 : getGasOilNo().hashCode());
result = prime * result + ((getGasGunNo() == null) ? 0 : getGasGunNo().hashCode());
result = prime * result + ((getGasOrderNo() == null) ? 0 : getGasOrderNo().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());
@ -302,6 +347,9 @@ public class HighChildOrder implements Serializable {
sb.append(", giveawayType=").append(giveawayType);
sb.append(", childOrdeStatus=").append(childOrdeStatus);
sb.append(", praiseStatus=").append(praiseStatus);
sb.append(", gasOilNo=").append(gasOilNo);
sb.append(", gasGunNo=").append(gasGunNo);
sb.append(", gasOrderNo=").append(gasOrderNo);
sb.append(", ext1=").append(ext1);
sb.append(", ext2=").append(ext2);
sb.append(", ext3=").append(ext3);

210
hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
Unescape View File

@ -995,6 +995,216 @@ public class HighChildOrderExample {
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<String> values) {
addCriterion("gas_oil_no in", values, "gasOilNo");
return (Criteria) this;
}
public Criteria andGasOilNoNotIn(List<String> 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<String> values) {
addCriterion("gas_gun_no in", values, "gasGunNo");
return (Criteria) this;
}
public Criteria andGasGunNoNotIn(List<String> 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 andGasOrderNoIsNull() {
addCriterion("gas_order_no is null");
return (Criteria) this;
}
public Criteria andGasOrderNoIsNotNull() {
addCriterion("gas_order_no is not null");
return (Criteria) this;
}
public Criteria andGasOrderNoEqualTo(String value) {
addCriterion("gas_order_no =", value, "gasOrderNo");
return (Criteria) this;
}
public Criteria andGasOrderNoNotEqualTo(String value) {
addCriterion("gas_order_no <>", value, "gasOrderNo");
return (Criteria) this;
}
public Criteria andGasOrderNoGreaterThan(String value) {
addCriterion("gas_order_no >", value, "gasOrderNo");
return (Criteria) this;
}
public Criteria andGasOrderNoGreaterThanOrEqualTo(String value) {
addCriterion("gas_order_no >=", value, "gasOrderNo");
return (Criteria) this;
}
public Criteria andGasOrderNoLessThan(String value) {
addCriterion("gas_order_no <", value, "gasOrderNo");
return (Criteria) this;
}
public Criteria andGasOrderNoLessThanOrEqualTo(String value) {
addCriterion("gas_order_no <=", value, "gasOrderNo");
return (Criteria) this;
}
public Criteria andGasOrderNoLike(String value) {
addCriterion("gas_order_no like", value, "gasOrderNo");
return (Criteria) this;
}
public Criteria andGasOrderNoNotLike(String value) {
addCriterion("gas_order_no not like", value, "gasOrderNo");
return (Criteria) this;
}
public Criteria andGasOrderNoIn(List<String> values) {
addCriterion("gas_order_no in", values, "gasOrderNo");
return (Criteria) this;
}
public Criteria andGasOrderNoNotIn(List<String> values) {
addCriterion("gas_order_no not in", values, "gasOrderNo");
return (Criteria) this;
}
public Criteria andGasOrderNoBetween(String value1, String value2) {
addCriterion("gas_order_no between", value1, value2, "gasOrderNo");
return (Criteria) this;
}
public Criteria andGasOrderNoNotBetween(String value1, String value2) {
addCriterion("gas_order_no not between", value1, value2, "gasOrderNo");
return (Criteria) this;
}
public Criteria andExt1IsNull() {
addCriterion("ext_1 is null");
return (Criteria) this;

Write Preview
Loading…
Cancel
Save