'提交diam'

dev-discount
= 4 years ago
parent fcf97218ec
commit 77295c5b5b
  1. 8
      hai-cweb/src/main/java/com/cweb/controller/CommonController.java
  2. 2
      hai-cweb/src/main/java/com/cweb/controller/HighGasController.java
  3. 2
      hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java
  4. 18
      hai-service/src/main/java/com/hai/config/CommonSysConfig.java
  5. 19
      hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
  6. 14
      hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
  7. 16
      hai-service/src/main/java/com/hai/entity/HighChildOrder.java
  8. 60
      hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
  9. 7
      hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java
  10. 2
      hai-service/src/main/resources/dev/commonConfig.properties
  11. 2
      hai-service/src/main/resources/prod/commonConfig.properties

@ -3,6 +3,7 @@ package com.cweb.controller;
import com.hai.common.utils.ResponseMsgUtil; import com.hai.common.utils.ResponseMsgUtil;
import com.hai.entity.BsCompany; import com.hai.entity.BsCompany;
import com.hai.entity.SecConfig; import com.hai.entity.SecConfig;
import com.hai.entity.SecRegion;
import com.hai.model.ResponseData; import com.hai.model.ResponseData;
import com.hai.service.BsCompanyService; import com.hai.service.BsCompanyService;
import com.hai.service.CommonService; import com.hai.service.CommonService;
@ -50,9 +51,12 @@ public class CommonController {
for (BsCompany company : list) { for (BsCompany company : list) {
map = new HashMap<>(); map = new HashMap<>();
if (StringUtils.isNotBlank(company.getRegionId())) { if (StringUtils.isNotBlank(company.getRegionId())) {
map.put("regionId", company.getRegionId());
map.put("regionName", commonService.getRegionName(Long.parseLong(company.getRegionId())));
map.put("companyId", company.getId()); map.put("companyId", company.getId());
map.put("regionId", company.getRegionId());
SecRegion secRegion = commonService.getRegionsById(Long.parseLong(company.getRegionId()));
if (secRegion != null) {
map.put("regionName", secRegion.getRegionName());
}
mapList.add(map); mapList.add(map);
} }
} }

@ -96,7 +96,7 @@ public class HighGasController {
result.put("distance", Math.round(distance/100d)/10d); result.put("distance", Math.round(distance/100d)/10d);
return ResponseMsgUtil.success(jsonObject.get("result")); return ResponseMsgUtil.success(jsonObject.get("result"));
} }
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未获取到加油站信息"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jsonObject.getString("message"));
} catch (Exception e) { } catch (Exception e) {
log.error("HighGasController -> getGasDetailByStoreKey() error!",e); log.error("HighGasController -> getGasDetailByStoreKey() error!",e);

@ -167,7 +167,7 @@ public class HighOrderController {
} }
if (childOrder.getGoodsType() == 3) { if (childOrder.getGoodsType() == 3) {
if (childOrder.getGoodsPrice() == null || StringUtils.isBlank(childOrder.getGasGunNo()) || StringUtils.isBlank(childOrder.getGasOilNo())) { if (childOrder.getGoodsPrice() == null || StringUtils.isBlank(childOrder.getGasGunNo()) || StringUtils.isBlank(childOrder.getGasOilNo()) || childOrder.getGasOilType() == null) {
log.error("HighOrderController --> addOrder() error!", "参数错误"); log.error("HighOrderController --> addOrder() error!", "参数错误");
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
} }

@ -12,6 +12,8 @@ public class CommonSysConfig {
private String tuanYouUrl; private String tuanYouUrl;
private String tuanYouAppKey; private String tuanYouAppKey;
private String tuanYouAppSecret; private String tuanYouAppSecret;
private String tuanYouDieselAccount; // 柴油账号
private String tuanYouGasolineAccount; // 汽油账号
private String wx_cert; private String wx_cert;
@ -46,4 +48,20 @@ public class CommonSysConfig {
public void setTuanYouAppSecret(String tuanYouAppSecret) { public void setTuanYouAppSecret(String tuanYouAppSecret) {
this.tuanYouAppSecret = tuanYouAppSecret; this.tuanYouAppSecret = tuanYouAppSecret;
} }
public String getTuanYouDieselAccount() {
return tuanYouDieselAccount;
}
public void setTuanYouDieselAccount(String tuanYouDieselAccount) {
this.tuanYouDieselAccount = tuanYouDieselAccount;
}
public String getTuanYouGasolineAccount() {
return tuanYouGasolineAccount;
}
public void setTuanYouGasolineAccount(String tuanYouGasolineAccount) {
this.tuanYouGasolineAccount = tuanYouGasolineAccount;
}
} }

@ -47,9 +47,9 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"total_price, giveaway_type, ", "total_price, giveaway_type, ",
"child_orde_status, praise_status, ", "child_orde_status, praise_status, ",
"gas_oil_no, gas_gun_no, ", "gas_oil_no, gas_gun_no, ",
"gas_order_no, gas_price_gun, ", "gas_oil_type, gas_order_no, ",
"gas_price_vip, ext_1, ", "gas_price_gun, gas_price_vip, ",
"ext_2, ext_3)", "ext_1, ext_2, ext_3)",
"values (#{orderId,jdbcType=BIGINT}, #{memId,jdbcType=BIGINT}, ", "values (#{orderId,jdbcType=BIGINT}, #{memId,jdbcType=BIGINT}, ",
"#{goodsType,jdbcType=INTEGER}, #{goodsId,jdbcType=BIGINT}, ", "#{goodsType,jdbcType=INTEGER}, #{goodsId,jdbcType=BIGINT}, ",
"#{goodsName,jdbcType=VARCHAR}, #{goodsImg,jdbcType=VARCHAR}, ", "#{goodsName,jdbcType=VARCHAR}, #{goodsImg,jdbcType=VARCHAR}, ",
@ -58,9 +58,9 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"#{totalPrice,jdbcType=DECIMAL}, #{giveawayType,jdbcType=BIT}, ", "#{totalPrice,jdbcType=DECIMAL}, #{giveawayType,jdbcType=BIT}, ",
"#{childOrdeStatus,jdbcType=INTEGER}, #{praiseStatus,jdbcType=INTEGER}, ", "#{childOrdeStatus,jdbcType=INTEGER}, #{praiseStatus,jdbcType=INTEGER}, ",
"#{gasOilNo,jdbcType=VARCHAR}, #{gasGunNo,jdbcType=VARCHAR}, ", "#{gasOilNo,jdbcType=VARCHAR}, #{gasGunNo,jdbcType=VARCHAR}, ",
"#{gasOrderNo,jdbcType=VARCHAR}, #{gasPriceGun,jdbcType=DECIMAL}, ", "#{gasOilType,jdbcType=INTEGER}, #{gasOrderNo,jdbcType=VARCHAR}, ",
"#{gasPriceVip,jdbcType=DECIMAL}, #{ext1,jdbcType=VARCHAR}, ", "#{gasPriceGun,jdbcType=DECIMAL}, #{gasPriceVip,jdbcType=DECIMAL}, ",
"#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
}) })
@Options(useGeneratedKeys=true,keyProperty="id") @Options(useGeneratedKeys=true,keyProperty="id")
int insert(HighChildOrder record); int insert(HighChildOrder record);
@ -88,6 +88,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
@Result(column="praise_status", property="praiseStatus", 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_oil_no", property="gasOilNo", jdbcType=JdbcType.VARCHAR),
@Result(column="gas_gun_no", property="gasGunNo", 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_order_no", property="gasOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="gas_order_no", property="gasOrderNo", jdbcType=JdbcType.VARCHAR),
@Result(column="gas_price_gun", property="gasPriceGun", 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_vip", property="gasPriceVip", jdbcType=JdbcType.DECIMAL),
@ -101,8 +102,8 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"select", "select",
"id, order_id, mem_id, goods_type, goods_id, goods_name, goods_img, goods_spec_name, ", "id, order_id, mem_id, goods_type, goods_id, goods_name, goods_img, goods_spec_name, ",
"goods_price, goods_actual_price, sale_count, total_price, giveaway_type, child_orde_status, ", "goods_price, goods_actual_price, sale_count, total_price, giveaway_type, child_orde_status, ",
"praise_status, gas_oil_no, gas_gun_no, gas_order_no, gas_price_gun, gas_price_vip, ", "praise_status, gas_oil_no, gas_gun_no, gas_oil_type, gas_order_no, gas_price_gun, ",
"ext_1, ext_2, ext_3", "gas_price_vip, ext_1, ext_2, ext_3",
"from high_child_order", "from high_child_order",
"where id = #{id,jdbcType=BIGINT}" "where id = #{id,jdbcType=BIGINT}"
}) })
@ -124,6 +125,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
@Result(column="praise_status", property="praiseStatus", 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_oil_no", property="gasOilNo", jdbcType=JdbcType.VARCHAR),
@Result(column="gas_gun_no", property="gasGunNo", 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_order_no", property="gasOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="gas_order_no", property="gasOrderNo", jdbcType=JdbcType.VARCHAR),
@Result(column="gas_price_gun", property="gasPriceGun", 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_vip", property="gasPriceVip", jdbcType=JdbcType.DECIMAL),
@ -160,6 +162,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"praise_status = #{praiseStatus,jdbcType=INTEGER},", "praise_status = #{praiseStatus,jdbcType=INTEGER},",
"gas_oil_no = #{gasOilNo,jdbcType=VARCHAR},", "gas_oil_no = #{gasOilNo,jdbcType=VARCHAR},",
"gas_gun_no = #{gasGunNo,jdbcType=VARCHAR},", "gas_gun_no = #{gasGunNo,jdbcType=VARCHAR},",
"gas_oil_type = #{gasOilType,jdbcType=INTEGER},",
"gas_order_no = #{gasOrderNo,jdbcType=VARCHAR},", "gas_order_no = #{gasOrderNo,jdbcType=VARCHAR},",
"gas_price_gun = #{gasPriceGun,jdbcType=DECIMAL},", "gas_price_gun = #{gasPriceGun,jdbcType=DECIMAL},",
"gas_price_vip = #{gasPriceVip,jdbcType=DECIMAL},", "gas_price_vip = #{gasPriceVip,jdbcType=DECIMAL},",

@ -92,6 +92,10 @@ public class HighChildOrderSqlProvider {
sql.VALUES("gas_gun_no", "#{gasGunNo,jdbcType=VARCHAR}"); sql.VALUES("gas_gun_no", "#{gasGunNo,jdbcType=VARCHAR}");
} }
if (record.getGasOilType() != null) {
sql.VALUES("gas_oil_type", "#{gasOilType,jdbcType=INTEGER}");
}
if (record.getGasOrderNo() != null) { if (record.getGasOrderNo() != null) {
sql.VALUES("gas_order_no", "#{gasOrderNo,jdbcType=VARCHAR}"); sql.VALUES("gas_order_no", "#{gasOrderNo,jdbcType=VARCHAR}");
} }
@ -142,6 +146,7 @@ public class HighChildOrderSqlProvider {
sql.SELECT("praise_status"); sql.SELECT("praise_status");
sql.SELECT("gas_oil_no"); sql.SELECT("gas_oil_no");
sql.SELECT("gas_gun_no"); sql.SELECT("gas_gun_no");
sql.SELECT("gas_oil_type");
sql.SELECT("gas_order_no"); sql.SELECT("gas_order_no");
sql.SELECT("gas_price_gun"); sql.SELECT("gas_price_gun");
sql.SELECT("gas_price_vip"); sql.SELECT("gas_price_vip");
@ -233,6 +238,10 @@ public class HighChildOrderSqlProvider {
sql.SET("gas_gun_no = #{record.gasGunNo,jdbcType=VARCHAR}"); sql.SET("gas_gun_no = #{record.gasGunNo,jdbcType=VARCHAR}");
} }
if (record.getGasOilType() != null) {
sql.SET("gas_oil_type = #{record.gasOilType,jdbcType=INTEGER}");
}
if (record.getGasOrderNo() != null) { if (record.getGasOrderNo() != null) {
sql.SET("gas_order_no = #{record.gasOrderNo,jdbcType=VARCHAR}"); sql.SET("gas_order_no = #{record.gasOrderNo,jdbcType=VARCHAR}");
} }
@ -282,6 +291,7 @@ public class HighChildOrderSqlProvider {
sql.SET("praise_status = #{record.praiseStatus,jdbcType=INTEGER}"); sql.SET("praise_status = #{record.praiseStatus,jdbcType=INTEGER}");
sql.SET("gas_oil_no = #{record.gasOilNo,jdbcType=VARCHAR}"); sql.SET("gas_oil_no = #{record.gasOilNo,jdbcType=VARCHAR}");
sql.SET("gas_gun_no = #{record.gasGunNo,jdbcType=VARCHAR}"); sql.SET("gas_gun_no = #{record.gasGunNo,jdbcType=VARCHAR}");
sql.SET("gas_oil_type = #{record.gasOilType,jdbcType=INTEGER}");
sql.SET("gas_order_no = #{record.gasOrderNo,jdbcType=VARCHAR}"); sql.SET("gas_order_no = #{record.gasOrderNo,jdbcType=VARCHAR}");
sql.SET("gas_price_gun = #{record.gasPriceGun,jdbcType=DECIMAL}"); sql.SET("gas_price_gun = #{record.gasPriceGun,jdbcType=DECIMAL}");
sql.SET("gas_price_vip = #{record.gasPriceVip,jdbcType=DECIMAL}"); sql.SET("gas_price_vip = #{record.gasPriceVip,jdbcType=DECIMAL}");
@ -362,6 +372,10 @@ public class HighChildOrderSqlProvider {
sql.SET("gas_gun_no = #{gasGunNo,jdbcType=VARCHAR}"); sql.SET("gas_gun_no = #{gasGunNo,jdbcType=VARCHAR}");
} }
if (record.getGasOilType() != null) {
sql.SET("gas_oil_type = #{gasOilType,jdbcType=INTEGER}");
}
if (record.getGasOrderNo() != null) { if (record.getGasOrderNo() != null) {
sql.SET("gas_order_no = #{gasOrderNo,jdbcType=VARCHAR}"); sql.SET("gas_order_no = #{gasOrderNo,jdbcType=VARCHAR}");
} }

@ -98,6 +98,11 @@ public class HighChildOrder implements Serializable {
*/ */
private String gasGunNo; private String gasGunNo;
/**
* 加油站油品类型 1:汽油:2:柴油;3:天然气
*/
private Integer gasOilType;
/** /**
* 加油站订单号 * 加油站订单号
*/ */
@ -257,6 +262,14 @@ public class HighChildOrder implements Serializable {
this.gasGunNo = gasGunNo; this.gasGunNo = gasGunNo;
} }
public Integer getGasOilType() {
return gasOilType;
}
public void setGasOilType(Integer gasOilType) {
this.gasOilType = gasOilType;
}
public String getGasOrderNo() { public String getGasOrderNo() {
return gasOrderNo; return gasOrderNo;
} }
@ -334,6 +347,7 @@ public class HighChildOrder implements Serializable {
&& (this.getPraiseStatus() == null ? other.getPraiseStatus() == null : this.getPraiseStatus().equals(other.getPraiseStatus())) && (this.getPraiseStatus() == null ? other.getPraiseStatus() == null : this.getPraiseStatus().equals(other.getPraiseStatus()))
&& (this.getGasOilNo() == null ? other.getGasOilNo() == null : this.getGasOilNo().equals(other.getGasOilNo())) && (this.getGasOilNo() == null ? other.getGasOilNo() == null : this.getGasOilNo().equals(other.getGasOilNo()))
&& (this.getGasGunNo() == null ? other.getGasGunNo() == null : this.getGasGunNo().equals(other.getGasGunNo())) && (this.getGasGunNo() == null ? other.getGasGunNo() == null : this.getGasGunNo().equals(other.getGasGunNo()))
&& (this.getGasOilType() == null ? other.getGasOilType() == null : this.getGasOilType().equals(other.getGasOilType()))
&& (this.getGasOrderNo() == null ? other.getGasOrderNo() == null : this.getGasOrderNo().equals(other.getGasOrderNo())) && (this.getGasOrderNo() == null ? other.getGasOrderNo() == null : this.getGasOrderNo().equals(other.getGasOrderNo()))
&& (this.getGasPriceGun() == null ? other.getGasPriceGun() == null : this.getGasPriceGun().equals(other.getGasPriceGun())) && (this.getGasPriceGun() == null ? other.getGasPriceGun() == null : this.getGasPriceGun().equals(other.getGasPriceGun()))
&& (this.getGasPriceVip() == null ? other.getGasPriceVip() == null : this.getGasPriceVip().equals(other.getGasPriceVip())) && (this.getGasPriceVip() == null ? other.getGasPriceVip() == null : this.getGasPriceVip().equals(other.getGasPriceVip()))
@ -363,6 +377,7 @@ public class HighChildOrder implements Serializable {
result = prime * result + ((getPraiseStatus() == null) ? 0 : getPraiseStatus().hashCode()); result = prime * result + ((getPraiseStatus() == null) ? 0 : getPraiseStatus().hashCode());
result = prime * result + ((getGasOilNo() == null) ? 0 : getGasOilNo().hashCode()); result = prime * result + ((getGasOilNo() == null) ? 0 : getGasOilNo().hashCode());
result = prime * result + ((getGasGunNo() == null) ? 0 : getGasGunNo().hashCode()); result = prime * result + ((getGasGunNo() == null) ? 0 : getGasGunNo().hashCode());
result = prime * result + ((getGasOilType() == null) ? 0 : getGasOilType().hashCode());
result = prime * result + ((getGasOrderNo() == null) ? 0 : getGasOrderNo().hashCode()); result = prime * result + ((getGasOrderNo() == null) ? 0 : getGasOrderNo().hashCode());
result = prime * result + ((getGasPriceGun() == null) ? 0 : getGasPriceGun().hashCode()); result = prime * result + ((getGasPriceGun() == null) ? 0 : getGasPriceGun().hashCode());
result = prime * result + ((getGasPriceVip() == null) ? 0 : getGasPriceVip().hashCode()); result = prime * result + ((getGasPriceVip() == null) ? 0 : getGasPriceVip().hashCode());
@ -395,6 +410,7 @@ public class HighChildOrder implements Serializable {
sb.append(", praiseStatus=").append(praiseStatus); sb.append(", praiseStatus=").append(praiseStatus);
sb.append(", gasOilNo=").append(gasOilNo); sb.append(", gasOilNo=").append(gasOilNo);
sb.append(", gasGunNo=").append(gasGunNo); sb.append(", gasGunNo=").append(gasGunNo);
sb.append(", gasOilType=").append(gasOilType);
sb.append(", gasOrderNo=").append(gasOrderNo); sb.append(", gasOrderNo=").append(gasOrderNo);
sb.append(", gasPriceGun=").append(gasPriceGun); sb.append(", gasPriceGun=").append(gasPriceGun);
sb.append(", gasPriceVip=").append(gasPriceVip); sb.append(", gasPriceVip=").append(gasPriceVip);

@ -1195,6 +1195,66 @@ public class HighChildOrderExample {
return (Criteria) this; 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<Integer> values) {
addCriterion("gas_oil_type in", values, "gasOilType");
return (Criteria) this;
}
public Criteria andGasOilTypeNotIn(List<Integer> 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 andGasOrderNoIsNull() { public Criteria andGasOrderNoIsNull() {
addCriterion("gas_order_no is null"); addCriterion("gas_order_no is null");
return (Criteria) this; return (Criteria) this;

@ -7,6 +7,7 @@ import com.hai.common.exception.SysCode;
import com.hai.common.pay.util.XmlUtil; import com.hai.common.pay.util.XmlUtil;
import com.hai.common.pay.util.sdk.WXPayConstants; import com.hai.common.pay.util.sdk.WXPayConstants;
import com.hai.common.utils.WxUtils; import com.hai.common.utils.WxUtils;
import com.hai.config.CommonSysConst;
import com.hai.config.TuanYouConfig; import com.hai.config.TuanYouConfig;
import com.hai.dao.HighGasOrderPushMapper; import com.hai.dao.HighGasOrderPushMapper;
import com.hai.dao.HighUserCouponMapper; import com.hai.dao.HighUserCouponMapper;
@ -151,6 +152,12 @@ public class GoodsOrderServiceImpl implements PayService {
paramMap.put("thirdSerialNo", order.getOrderNo()); paramMap.put("thirdSerialNo", order.getOrderNo());
paramMap.put("refuelingAmount", highChildOrder.getGoodsActualPrice()); paramMap.put("refuelingAmount", highChildOrder.getGoodsActualPrice());
// 油品类型 1:汽油:2:柴油;3:天然气
if (highChildOrder.getGasOilType() == 1) {
paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouGasolineAccount());
} else if (highChildOrder.getGasOilType() == 2) {
paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouDieselAccount());
}
JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(paramMap); JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(paramMap);
System.out.println(orderPushObject.toJSONString()); System.out.println(orderPushObject.toJSONString());
// 推送团油订单记录 // 推送团油订单记录

@ -1,5 +1,7 @@
tuanYouUrl=https://test02-motorcade-hcs.czb365.com tuanYouUrl=https://test02-motorcade-hcs.czb365.com
tuanYouAppKey=208241666939552 tuanYouAppKey=208241666939552
tuanYouAppSecret=adecc3cff077834cb8632c8ab3bec0e6 tuanYouAppSecret=adecc3cff077834cb8632c8ab3bec0e6
tuanYouDieselAccount =9b115eao4400
tuanYouGasolineAccount =9b115e5g4400
wx_cert=/home/project/wx_cert/ wx_cert=/home/project/wx_cert/

@ -1,5 +1,7 @@
tuanYouUrl=https://test04-motorcade-hcs.czb365.com tuanYouUrl=https://test04-motorcade-hcs.czb365.com
tuanYouAppKey=208241666939552 tuanYouAppKey=208241666939552
tuanYouAppSecret=adecc3cff077834cb8632c8ab3bec0e6 tuanYouAppSecret=adecc3cff077834cb8632c8ab3bec0e6
tuanYouDieselAccount=9b115eao4400
tuanYouGasolineAccount=9b115e5g4400
wx_cert=/home/project/wx_cert/ wx_cert=/home/project/wx_cert/
Loading…
Cancel
Save