* 'dev' of http://139.159.177.244:3000/hurui/hai-server:
  提交代码
  提交代码
  提交代码
  提交代码
  提交代码
  提交代码
  提交代码

# Conflicts:
#	hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java
#	hai-service/src/main/java/com/hai/entity/HighOrder.java
dev-discount
袁野 2 years ago
commit 90b6826838
  1. 10
      hai-bweb/src/main/java/com/bweb/controller/HighGasController.java
  2. 2
      hai-bweb/src/main/java/com/bweb/model/ImportStoreModel.java
  3. 74
      hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java
  4. 2
      hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
  5. 81
      hai-cweb/src/main/java/com/cweb/controller/HighUserDiscountController.java
  6. 3
      hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java
  7. 11
      hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java
  8. 29
      hai-service/src/main/java/com/hai/config/CommonSysConfig.java
  9. 15
      hai-service/src/main/java/com/hai/config/JinZhuJiaYouService.java
  10. 13
      hai-service/src/main/java/com/hai/config/ShellGroupService.java
  11. 55
      hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
  12. 14
      hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
  13. 19
      hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapper.java
  14. 14
      hai-service/src/main/java/com/hai/dao/HighGasOilPriceSqlProvider.java
  15. 82
      hai-service/src/main/java/com/hai/dao/HighOrderMapper.java
  16. 14
      hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java
  17. 16
      hai-service/src/main/java/com/hai/entity/HighChildOrder.java
  18. 60
      hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
  19. 16
      hai-service/src/main/java/com/hai/entity/HighGasOilPrice.java
  20. 60
      hai-service/src/main/java/com/hai/entity/HighGasOilPriceExample.java
  21. 46
      hai-service/src/main/java/com/hai/entity/HighOrder.java
  22. 60
      hai-service/src/main/java/com/hai/entity/HighOrderExample.java
  23. 1
      hai-service/src/main/java/com/hai/enum_type/DiscountUseScope.java
  24. 9
      hai-service/src/main/java/com/hai/enum_type/JinZhuJiaYouOilNo.java
  25. 51
      hai-service/src/main/java/com/hai/enum_type/OrderChildGoodsTypeEnum.java
  26. 7
      hai-service/src/main/java/com/hai/service/HighOrderService.java
  27. 9
      hai-service/src/main/java/com/hai/service/impl/HighGasServiceImpl.java
  28. 355
      hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
  29. 10
      hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java
  30. 13
      hai-service/src/main/resources/dev/commonConfig.properties
  31. 5
      hai-service/src/main/resources/pre/commonConfig.properties
  32. 5
      hai-service/src/main/resources/prod-9401/commonConfig.properties
  33. 5
      hai-service/src/main/resources/prod/commonConfig.properties

@ -812,6 +812,10 @@ public class HighGasController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "退款失败,未找到加油站信息");
}
// 油站来源,根据不同的来源,请求不同的退款业务接口。
// 团油 退款需要申请。不是实时退款
// 加好油 实时退款,退款成功就可以退款给用户
// 金猪加油 没有线上退款接口,线下核实后直接退款给用户。
if (store.getSourceType().equals(MerchantStoreSourceType.type2.getNumber())) {
JSONObject object = TuanYouConfig.refuelingOrderRefund(order.getMemPhone(), order.getOrderNo(), body.getString("refundContent"));
if (object == null || !object.getString("code").equals("200")) {
@ -831,9 +835,13 @@ public class HighGasController {
highOrderService.updateOrderDetail(order);
}
// 用户支付金额原路退款
// 来源类型 1:平台自建 2:团油
if (store.getSourceType().equals(MerchantStoreSourceType.type1.getNumber())
|| store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())) {
|| store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())
|| store.getSourceType().equals(MerchantStoreSourceType.type4.getNumber())
) {
if (order.getPayType() == 2) {
OrderRefundModel orderRefundModel = WxOrderConfig.orderToRefund(order.getPaySerialNo(), order.getPayRealPrice(), order.getAccountMerchantNum(), order.getPayRealPrice());

@ -5,7 +5,7 @@ import com.alibaba.excel.annotation.format.DateTimeFormat;
/**
* @Author 胡锐
* @Description 导入门店
* @Description
* @Date 2021/3/26 19:23
**/
public class ImportStoreModel {

@ -20,6 +20,7 @@ import com.hai.config.TuanYouConfig;
import com.hai.entity.*;
import com.hai.enum_type.DiscountUseScope;
import com.hai.enum_type.GasClassGroupTaskStatus;
import com.hai.enum_type.OrderChildGoodsTypeEnum;
import com.hai.model.GasPayPriceModel;
import com.hai.model.HighMerchantStoreModel;
import com.hai.model.HighUserModel;
@ -322,9 +323,25 @@ public class HighOrderController {
// 计算价格
GasPayPriceModel priceModel = gasDiscountOilPriceService.oilPriceDiscountCompute(childOrder.getGoodsPrice(), childOrder.getGoodsId(), childOrder.getGasOilNo(), highOrder.getIsTyAgent());
// 使用了优惠价
if (highDiscountUserRel != null) {
// 支付价格
childOrder.setGoodsActualPrice(childOrder.getGoodsPrice());
// 油价信息
childOrder.setGasPriceGun(priceModel.getPriceGun());
childOrder.setGasPriceVip(priceModel.getPriceVip());
childOrder.setGasPriceOfficial(priceModel.getPriceOfficial());
childOrder.setGasPricePlatform(priceModel.getPriceVip());
childOrder.setGasOilLiters(priceModel.getOilLiters());
childOrder.setGasDiscount(new BigDecimal("0"));
childOrder.setExt1(childOrder.getGasPricePlatform().toString());
childOrder.setGasOilSubsidy(new BigDecimal("0"));
childOrder.setGasLitersPreferences(new BigDecimal("0"));
childOrder.setGasPricePreferences(priceModel.getPriceVip());
} else {
// 支付价格
childOrder.setGoodsActualPrice(priceModel.getPayPrice());
// 油价信息
childOrder.setGasPriceGun(priceModel.getPriceGun());
childOrder.setGasPriceVip(priceModel.getPriceVip());
@ -336,6 +353,8 @@ public class HighOrderController {
childOrder.setGasOilSubsidy(priceModel.getPreferentialMargin());
childOrder.setGasLitersPreferences(priceModel.getLitersPreferences());
childOrder.setGasPricePreferences(priceModel.getPricePreferences());
}
// 来源类型 1:平台自建 2:团油
if (store.getSourceType().equals(1)) {
@ -411,13 +430,19 @@ public class HighOrderController {
totalPrice = totalPrice.add(childOrder.getTotalPrice());
totalActualPrice = totalActualPrice.add(childOrder.getGoodsActualPrice());
}
// 积分抵扣金额
BigDecimal integralDeductionPrice = new BigDecimal(0);
if (buyPoints && highOrder.getPayGold() != null) {
<<<<<<< HEAD
integralDeductionPrice = new BigDecimal(highOrder.getPayGold()).divide(new BigDecimal(100));
String remark = "订单" + highOrder.getOrderNo() + "购买,使用积分:" + highOrder.getPayGold();
highUserService.goldHandle(userInfoModel.getHighUser().getId(), highOrder.getPayGold(), 2, 2, highOrder.getId() , remark);
=======
integralDeductionPrice = new BigDecimal(highOrder.getPayGold().toString()).divide(new BigDecimal(100));
highUserService.goldHandle(userInfoModel.getHighUser().getId(), highOrder.getPayGold(), 2, 2, highOrder.getId());
>>>>>>> 848fcba6384da50fdbd18a8fcc2e19ac7c72a25a
BigDecimal payGold = new BigDecimal(highOrder.getPayGold());
@ -427,6 +452,7 @@ public class HighOrderController {
}
}
<<<<<<< HEAD
SecRegion region = commonService.getParentByRegion(Long.valueOf(request.getHeader("regionId")));
BsCompany bsCompany = bsCompanyService.selectCompanyByRegion(region.getRegionId().toString());
@ -434,31 +460,38 @@ public class HighOrderController {
highOrder.setCompanyId(bsCompany.getId());
}
=======
>>>>>>> 848fcba6384da50fdbd18a8fcc2e19ac7c72a25a
highOrder.setMerchId(request.getHeader("mchId"));
highOrder.setTotalPrice(totalPrice);
highOrder.setPayablePrice(totalActualPrice);
// 是否使用了优惠券
if (highDiscountUserRel != null) {
highOrder.setMemDiscountName(highDiscountUserRel.getHighDiscount().getDiscountName());
// 交易优惠券使用范围
// 优惠券使用范围
if (highDiscountUserRel.getHighDiscount().getUseScope().equals(DiscountUseScope.type1.getType())) {
// 暂无限制
} else if (highDiscountUserRel.getHighDiscount().getUseScope().equals(DiscountUseScope.type2.getType())) {
// 1:卡卷 2:金币充值 3:团油【加油站】 4: KFC 5:电影票 6:话费充值
if (!highOrder.getHighChildOrderList().get(0).getGoodsType().equals(1)) {
log.error("HighOrderController --> addOrder() error!", "此优惠券只能购买卡券商品使用");
throw ErrorHelp.genException(SysCode.System, ErrorCode.UN_MEMBER_ERROR, "此优惠券只能购买卡券商品使用");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "此优惠券只能购买卡券商品使用");
}
} else if (highDiscountUserRel.getHighDiscount().getUseScope().equals(DiscountUseScope.type3.getType())) {
if (!highOrder.getHighChildOrderList().get(0).getGoodsType().equals(6)) {
log.error("HighOrderController --> addOrder() error!", "此优惠券只能充值话费中使用");
throw ErrorHelp.genException(SysCode.System, ErrorCode.UN_MEMBER_ERROR, "此优惠券只能充值话费中使用");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "此优惠券只能充值话费中使用");
}
} else if (highDiscountUserRel.getHighDiscount().getUseScope().equals(DiscountUseScope.type7.getType())) {
if (!highOrder.getHighChildOrderList().get(0).getGoodsType().equals(3)) {
log.error("HighOrderController --> addOrder() error!", "此优惠券只能充值话费中使用");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "此优惠券只能充值话费中使用");
}
} else {
log.error("HighOrderController --> addOrder() error!", "暂时无法使用此优惠券");
throw ErrorHelp.genException(SysCode.System, ErrorCode.UN_MEMBER_ERROR, "暂时无法使用此优惠券");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法使用此优惠券");
}
// 卡卷类型 1:满减 2:抵扣 3:折扣
@ -469,28 +502,28 @@ public class HighOrderController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.UN_MEMBER_ERROR, "订单未达到"+highDiscountUserRel.getHighDiscount().getDiscountCondition()+"元,无法使用此优惠券");
}
// 订单总额 - 满减额度
BigDecimal payPrice = highOrder.getTotalPrice().subtract(highDiscountUserRel.getHighDiscount().getDiscountPrice());
BigDecimal payablePrice = highOrder.getTotalPrice().subtract(highDiscountUserRel.getHighDiscount().getDiscountPrice());
highOrder.setDeductionPrice(highDiscountUserRel.getHighDiscount().getDiscountPrice());
// 如果总额小于0
if (payPrice.compareTo(new BigDecimal("0")) < 0) {
highOrder.setPayPrice(new BigDecimal("0"));
if (payablePrice.compareTo(new BigDecimal("0")) < 0) {
highOrder.setPayablePrice(new BigDecimal("0"));
} else {
highOrder.setPayPrice(payPrice);
highOrder.setPayablePrice(payablePrice);
}
}
// 卡卷类型 1:满减 2:抵扣 3:折扣
if (highDiscountUserRel.getHighDiscount().getDiscountType() == 2) {
// 订单总额 - 满减额度
BigDecimal payPrice = highOrder.getTotalPrice().subtract(highDiscountUserRel.getHighDiscount().getDiscountPrice());
BigDecimal payablePrice = highOrder.getTotalPrice().subtract(highDiscountUserRel.getHighDiscount().getDiscountPrice());
highOrder.setDeductionPrice(highDiscountUserRel.getHighDiscount().getDiscountPrice());
// 如果总额小于0
if (payPrice.compareTo(new BigDecimal("0")) == -1) {
highOrder.setPayPrice(new BigDecimal("0"));
if (payablePrice.compareTo(new BigDecimal("0")) == -1) {
highOrder.setPayablePrice(new BigDecimal("0"));
} else {
highOrder.setPayPrice(payPrice);
highOrder.setPayablePrice(payablePrice);
}
}
@ -499,16 +532,12 @@ public class HighOrderController {
// 折扣除100
BigDecimal discountPrice = highDiscountUserRel.getHighDiscount().getDiscountPrice();
// 订单总额 * 折扣
BigDecimal payPrice = highOrder.getTotalPrice().multiply(discountPrice);
highOrder.setDeductionPrice(highOrder.getTotalPrice().subtract(payPrice));
highOrder.setPayPrice(payPrice);
BigDecimal payablePrice = highOrder.getTotalPrice().multiply(discountPrice).setScale(2, BigDecimal.ROUND_HALF_DOWN);
highOrder.setDeductionPrice(highOrder.getTotalPrice().subtract(payablePrice));
highOrder.setPayablePrice(payablePrice);
}
}
if (highOrder.getPayPrice() == null) {
highOrder.setPayPrice(totalActualPrice);
}
highOrder.setOrderNo("HF" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5));
highOrder.setMemId(userInfoModel.getHighUser().getId());
highOrder.setMemName(userInfoModel.getHighUser().getName());
@ -517,7 +546,7 @@ public class HighOrderController {
highOrder.setOrderStatus(1);
highOrder.setPrintStatus(false);
highOrder.setPrintNum(0);
highOrder.setPayPrice(highOrder.getPayPrice().subtract(integralDeductionPrice));
highOrder.setPayPrice(highOrder.getPayablePrice().subtract(integralDeductionPrice));
highOrder.setDeductionPrice(highOrder.getTotalPrice().subtract(highOrder.getPayPrice()));
highOrderService.insertOrder(highOrder);
@ -627,4 +656,5 @@ public class HighOrderController {
return ResponseMsgUtil.exception(e);
}
}
}

File diff suppressed because one or more lines are too long

@ -11,6 +11,8 @@ import com.hai.common.security.SessionObject;
import com.hai.common.security.UserCenter;
import com.hai.common.utils.ResponseMsgUtil;
import com.hai.entity.*;
import com.hai.enum_type.DiscountUseScope;
import com.hai.enum_type.OrderChildGoodsTypeEnum;
import com.hai.model.HighUserModel;
import com.hai.model.ResponseData;
import com.hai.service.*;
@ -250,4 +252,83 @@ public class HighUserDiscountController {
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/canUseDiscount",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "商品可以使用的优惠券")
public ResponseData canUseDiscount(@RequestBody JSONObject body) {
try {
// 用户
HighUserModel userInfoModel = userCenter.getSessionModel(HighUserModel.class);
if (userInfoModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, "");
}
if (body == null
|| body.getInteger("goodsType") == null
|| body.getLong("goodsId") == null
|| body.getBigDecimal("goodsPrice") == null
) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
// 商品类型
OrderChildGoodsTypeEnum goodsType = OrderChildGoodsTypeEnum.getDataByType(body.getInteger("goodsType"));
if (goodsType == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的商品类型");
}
Map<String,Object> map = new HashMap<>();
map.put("userId", userInfoModel.getHighUser().getId());
map.put("status", 1);
// 查询用户的优惠券
List<HighDiscountUserRel> userDiscountList = highDiscountUserRelService.getDiscountList(map);
List<HighDiscountUserRel> list = new ArrayList<>();
if (userDiscountList.size() > 0) {
if (goodsType.getType().equals(OrderChildGoodsTypeEnum.type1.getType())) {
// 查询当前卡券有哪些优惠券
List<HighDiscountCouponRel> discountCouponRelList = highDiscountCouponRelService.getRelByCoupon(body.getLong("goodsId"));
if (discountCouponRelList.size() > 0) {
for (HighDiscountCouponRel highDiscountCouponRel : discountCouponRelList) {
List<HighDiscountUserRel> collect = userDiscountList.stream().filter(o -> o.getDiscountId().equals(highDiscountCouponRel.getDiscountId())).collect(Collectors.toList());
if (collect != null && collect.size() > 0) {
for (HighDiscountUserRel discountUser : collect) {
list.add(discountUser);
}
}
}
}
}
if (goodsType.getType().equals(OrderChildGoodsTypeEnum.type3.getType())) {
// 过滤出加油服务的加油券
List<HighDiscountUserRel> collect = userDiscountList.stream().filter(o -> o.getHighDiscount().getUseScope().equals(DiscountUseScope.type7.getType())).collect(Collectors.toList());
for (HighDiscountUserRel userDiscount : collect) {
// 满减
if (userDiscount.getHighDiscount().getDiscountType().equals(1)) {
if (body.getBigDecimal("goodsPrice").compareTo(userDiscount.getHighDiscount().getDiscountCondition()) >= 0) {
list.add(userDiscount);
}
}
if (userDiscount.getHighDiscount().getDiscountType().equals(2)
|| userDiscount.getHighDiscount().getDiscountType().equals(3)) {
list.add(userDiscount);
}
}
}
list.sort(Comparator.comparing(o -> o.getUseEndTime()));
}
return ResponseMsgUtil.success(list);
} catch (Exception e) {
log.error("HighDiscountController -> getDiscountListByCoupon() error!",e);
return ResponseMsgUtil.exception(e);
}
}
}

@ -420,7 +420,8 @@ public class OrderController {
}
// 来源类型 1:平台自建 2:团油
if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())) {
if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())
|| store.getSourceType().equals(MerchantStoreSourceType.type4.getNumber())) {
BigDecimal account = new BigDecimal("0");
// 查询账号余额
HighMerchantAccount merAccount = merchantAccountService.getStoreAccountDetail(store.getMerchantId());

@ -348,14 +348,17 @@ public class UnionPayController {
}
} else if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())) {
// 推送壳牌
JSONObject syncPayment = shellGroupService.gasSyncPayment(order.getOrderNo(),
// 推送加好油
shellGroupService.gasSyncPayment(order.getOrderNo(),
store.getStoreKey(),
order.getPayTime(),
highChildOrder.getGasPriceGun(),
highChildOrder.getTotalPrice(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasGunNo(),
order.getTotalPrice());
order.getPayablePrice(),
order.getDeductionPrice()
);
}
}
if (highChildOrder.getGoodsType() == 4 || highChildOrder.getGoodsType() == 9) {

@ -27,6 +27,11 @@ public class CommonSysConfig {
private String shellPlatMerchantId;
private String shellPlatMerchantKey;
// 金猪参数
private String jzAppId;
private String jzPrivateKeyUrl;
private String jzPublicKeyUrl;
private String qinzhuUrl;
private String qinzhuUrlToken;
private String qinzhuHtmlUrl;
@ -94,6 +99,30 @@ public class CommonSysConfig {
private String unionSecret;
private String unionRsaKey;
public String getJzAppId() {
return jzAppId;
}
public void setJzAppId(String jzAppId) {
this.jzAppId = jzAppId;
}
public String getJzPrivateKeyUrl() {
return jzPrivateKeyUrl;
}
public void setJzPrivateKeyUrl(String jzPrivateKeyUrl) {
this.jzPrivateKeyUrl = jzPrivateKeyUrl;
}
public String getJzPublicKeyUrl() {
return jzPublicKeyUrl;
}
public void setJzPublicKeyUrl(String jzPublicKeyUrl) {
this.jzPublicKeyUrl = jzPublicKeyUrl;
}
public String getHuiliantongDistributorId() {
return huiliantongDistributorId;
}

@ -28,6 +28,12 @@ public class JinZhuJiaYouService {
private final static String reqUrl = "http://api.jianshiyun.com/api/gateway";
private final static String appId = CommonSysConst.getSysConfig().getJzAppId();
private final static String privateKeyUrl = CommonSysConst.getSysConfig().getJzPrivateKeyUrl();
private final static String publicKeyUrl = CommonSysConst.getSysConfig().getJzPublicKeyUrl();
@Resource
private BsTripartiteReqLogService reqLogService;
@ -111,8 +117,8 @@ public class JinZhuJiaYouService {
private JSONObject request(String service, Map<String,Object> param) throws Exception {
// 请求头部
Map<String, Object> heard = new HashMap<>();
heard.put("Request-App-Id", "app_xiaohan_test_01");
heard.put("Request-Service-Name", "STATION_TREE_PAGE");
heard.put("Request-App-Id", appId);
heard.put("Request-Service-Name", service);
heard.put("Request-Signature", generateSign(param));
JSONObject repsObject = HttpsUtils.doPost(reqUrl, param, heard);
@ -127,8 +133,7 @@ public class JinZhuJiaYouService {
if (repsObject == null
|| !repsObject.getInteger("status").equals(200)
|| !repsObject.getString("type").equals("OK")) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, repsObject == null?"请求失败":repsObject.getString("title"));
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, repsObject == null?"请求失败":repsObject.getString("detail"));
}
return repsObject;
}
@ -140,7 +145,7 @@ public class JinZhuJiaYouService {
* @throws Exception
*/
private static String generateSign(final Map<String, Object> data) throws IOException {
PrivateKey privateKey = PemUtil.loadPrivateKey(new FileInputStream("/home/project/hsg/jzKey.key"));
PrivateKey privateKey = PemUtil.loadPrivateKey(new FileInputStream(privateKeyUrl));
String signStr = null;
try {
Signature sign = Signature.getInstance("SHA256withRSA");

@ -65,10 +65,11 @@ public class ShellGroupService {
* @param orderNo 订单号
* @param stationCode 油站编码
* @param finishTime 完成时间
* @param oilPrice 金额
* @param oilPrice 油金额
* @param oilCode 油品编码
* @param oilGun 油枪
* @param channelSettlementAmount 加油金额
* @param settlementAmount 支付金额
* @param favourAmount 优惠金额
* @return
*/
public JSONObject gasSyncPayment(String orderNo,
@ -77,10 +78,9 @@ public class ShellGroupService {
BigDecimal oilPrice,
String oilCode,
String oilGun,
BigDecimal channelSettlementAmount) {
BigDecimal settlementAmount,
BigDecimal favourAmount) {
try {
Map<String, Object> param = new HashMap<>();
param.put("platMerchantId", CommonSysConst.getSysConfig().getShellPlatMerchantId());
param.put("stationCode", stationCode);
@ -91,7 +91,8 @@ public class ShellGroupService {
tradeOilOrder.put("amount", oilPrice);
tradeOilOrder.put("code", oilCode);
tradeOilOrder.put("oilGun", oilGun);
tradeOilOrder.put("channelSettlementAmount", channelSettlementAmount);
tradeOilOrder.put("channelSettlementAmount", settlementAmount);
tradeOilOrder.put("channelFavourAmount", favourAmount);
param.put("tradeOilOrder", JSONObject.toJSONString(tradeOilOrder));
return request(orderNo.replace("HF",""), "gas_sync_payment_notify", param);
} catch (Exception e) {

@ -52,16 +52,17 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"gas_oil_type, gas_order_no, ",
"gas_price_platform, gas_price_gun, ",
"gas_price_vip, gas_price_official, ",
"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, ",
"ext_1, ext_2, ext_3, ",
"ext_4, ext_5, ext_6)",
"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, ext_1, ",
"ext_2, ext_3, ext_4, ",
"ext_5, ext_6)",
"values (#{orderId,jdbcType=BIGINT}, #{memId,jdbcType=BIGINT}, ",
"#{storeId,jdbcType=BIGINT}, #{storeName,jdbcType=VARCHAR}, ",
"#{storeAddress,jdbcType=VARCHAR}, #{goodsType,jdbcType=INTEGER}, ",
@ -75,16 +76,17 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"#{gasOilType,jdbcType=INTEGER}, #{gasOrderNo,jdbcType=VARCHAR}, ",
"#{gasPricePlatform,jdbcType=DECIMAL}, #{gasPriceGun,jdbcType=DECIMAL}, ",
"#{gasPriceVip,jdbcType=DECIMAL}, #{gasPriceOfficial,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}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, ",
"#{ext4,jdbcType=VARCHAR}, #{ext5,jdbcType=VARCHAR}, #{ext6,jdbcType=VARCHAR})"
"#{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}, #{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(HighChildOrder record);
@ -122,6 +124,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
@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_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),
@ -153,11 +156,11 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"goods_name, goods_desc, goods_img, goods_spec_name, goods_price, goods_actual_price, ",
"sale_count, total_price, giveaway_type, child_orde_status, praise_status, gas_oil_no, ",
"gas_gun_no, gas_oil_type, gas_order_no, gas_price_platform, gas_price_gun, gas_price_vip, ",
"gas_price_official, 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, ext_1, ext_2, ext_3, ext_4, ext_5, ",
"ext_6",
"gas_price_official, 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, ext_1, ext_2, ext_3, ",
"ext_4, ext_5, ext_6",
"from high_child_order",
"where id = #{id,jdbcType=BIGINT}"
})
@ -189,6 +192,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
@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_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),
@ -251,6 +255,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"gas_price_gun = #{gasPriceGun,jdbcType=DECIMAL},",
"gas_price_vip = #{gasPriceVip,jdbcType=DECIMAL},",
"gas_price_official = #{gasPriceOfficial,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},",

@ -132,6 +132,10 @@ public class HighChildOrderSqlProvider {
sql.VALUES("gas_price_official", "#{gasPriceOfficial,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}");
}
@ -256,6 +260,7 @@ public class HighChildOrderSqlProvider {
sql.SELECT("gas_price_gun");
sql.SELECT("gas_price_vip");
sql.SELECT("gas_price_official");
sql.SELECT("gas_price_channel_pay");
sql.SELECT("gas_oil_liters");
sql.SELECT("gas_discount");
sql.SELECT("gas_oil_subsidy");
@ -403,6 +408,10 @@ public class HighChildOrderSqlProvider {
sql.SET("gas_price_official = #{record.gasPriceOfficial,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}");
}
@ -526,6 +535,7 @@ public class HighChildOrderSqlProvider {
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_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}");
@ -662,6 +672,10 @@ public class HighChildOrderSqlProvider {
sql.SET("gas_price_official = #{gasPriceOfficial,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}");
}

@ -43,16 +43,16 @@ public interface HighGasOilPriceMapper extends HighGasOilPriceMapperExt {
"oil_no_name, preferential_margin, ",
"gas_station_drop, price_vip, ",
"price_gun, price_official, ",
"oil_type, oil_type_name, ",
"`status`, ext_1, ext_2, ",
"ext_3)",
"price_cost, oil_type, ",
"oil_type_name, `status`, ",
"ext_1, ext_2, ext_3)",
"values (#{merchantStoreId,jdbcType=BIGINT}, #{oilNo,jdbcType=INTEGER}, ",
"#{oilNoName,jdbcType=VARCHAR}, #{preferentialMargin,jdbcType=DECIMAL}, ",
"#{gasStationDrop,jdbcType=DECIMAL}, #{priceVip,jdbcType=DECIMAL}, ",
"#{priceGun,jdbcType=DECIMAL}, #{priceOfficial,jdbcType=DECIMAL}, ",
"#{oilType,jdbcType=INTEGER}, #{oilTypeName,jdbcType=VARCHAR}, ",
"#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
"#{ext3,jdbcType=VARCHAR})"
"#{priceCost,jdbcType=DECIMAL}, #{oilType,jdbcType=INTEGER}, ",
"#{oilTypeName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(HighGasOilPrice record);
@ -72,6 +72,7 @@ public interface HighGasOilPriceMapper extends HighGasOilPriceMapperExt {
@Result(column="price_vip", property="priceVip", jdbcType=JdbcType.DECIMAL),
@Result(column="price_gun", property="priceGun", jdbcType=JdbcType.DECIMAL),
@Result(column="price_official", property="priceOfficial", jdbcType=JdbcType.DECIMAL),
@Result(column="price_cost", property="priceCost", jdbcType=JdbcType.DECIMAL),
@Result(column="oil_type", property="oilType", jdbcType=JdbcType.INTEGER),
@Result(column="oil_type_name", property="oilTypeName", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@ -84,8 +85,8 @@ public interface HighGasOilPriceMapper extends HighGasOilPriceMapperExt {
@Select({
"select",
"id, merchant_store_id, oil_no, oil_no_name, preferential_margin, gas_station_drop, ",
"price_vip, price_gun, price_official, oil_type, oil_type_name, `status`, ext_1, ",
"ext_2, ext_3",
"price_vip, price_gun, price_official, price_cost, oil_type, oil_type_name, `status`, ",
"ext_1, ext_2, ext_3",
"from high_gas_oil_price",
"where id = #{id,jdbcType=BIGINT}"
})
@ -99,6 +100,7 @@ public interface HighGasOilPriceMapper extends HighGasOilPriceMapperExt {
@Result(column="price_vip", property="priceVip", jdbcType=JdbcType.DECIMAL),
@Result(column="price_gun", property="priceGun", jdbcType=JdbcType.DECIMAL),
@Result(column="price_official", property="priceOfficial", jdbcType=JdbcType.DECIMAL),
@Result(column="price_cost", property="priceCost", jdbcType=JdbcType.DECIMAL),
@Result(column="oil_type", property="oilType", jdbcType=JdbcType.INTEGER),
@Result(column="oil_type_name", property="oilTypeName", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@ -127,6 +129,7 @@ public interface HighGasOilPriceMapper extends HighGasOilPriceMapperExt {
"price_vip = #{priceVip,jdbcType=DECIMAL},",
"price_gun = #{priceGun,jdbcType=DECIMAL},",
"price_official = #{priceOfficial,jdbcType=DECIMAL},",
"price_cost = #{priceCost,jdbcType=DECIMAL},",
"oil_type = #{oilType,jdbcType=INTEGER},",
"oil_type_name = #{oilTypeName,jdbcType=VARCHAR},",
"`status` = #{status,jdbcType=INTEGER},",

@ -60,6 +60,10 @@ public class HighGasOilPriceSqlProvider {
sql.VALUES("price_official", "#{priceOfficial,jdbcType=DECIMAL}");
}
if (record.getPriceCost() != null) {
sql.VALUES("price_cost", "#{priceCost,jdbcType=DECIMAL}");
}
if (record.getOilType() != null) {
sql.VALUES("oil_type", "#{oilType,jdbcType=INTEGER}");
}
@ -102,6 +106,7 @@ public class HighGasOilPriceSqlProvider {
sql.SELECT("price_vip");
sql.SELECT("price_gun");
sql.SELECT("price_official");
sql.SELECT("price_cost");
sql.SELECT("oil_type");
sql.SELECT("oil_type_name");
sql.SELECT("`status`");
@ -161,6 +166,10 @@ public class HighGasOilPriceSqlProvider {
sql.SET("price_official = #{record.priceOfficial,jdbcType=DECIMAL}");
}
if (record.getPriceCost() != null) {
sql.SET("price_cost = #{record.priceCost,jdbcType=DECIMAL}");
}
if (record.getOilType() != null) {
sql.SET("oil_type = #{record.oilType,jdbcType=INTEGER}");
}
@ -202,6 +211,7 @@ public class HighGasOilPriceSqlProvider {
sql.SET("price_vip = #{record.priceVip,jdbcType=DECIMAL}");
sql.SET("price_gun = #{record.priceGun,jdbcType=DECIMAL}");
sql.SET("price_official = #{record.priceOfficial,jdbcType=DECIMAL}");
sql.SET("price_cost = #{record.priceCost,jdbcType=DECIMAL}");
sql.SET("oil_type = #{record.oilType,jdbcType=INTEGER}");
sql.SET("oil_type_name = #{record.oilTypeName,jdbcType=VARCHAR}");
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
@ -250,6 +260,10 @@ public class HighGasOilPriceSqlProvider {
sql.SET("price_official = #{priceOfficial,jdbcType=DECIMAL}");
}
if (record.getPriceCost() != null) {
sql.SET("price_cost = #{priceCost,jdbcType=DECIMAL}");
}
if (record.getOilType() != null) {
sql.SET("oil_type = #{oilType,jdbcType=INTEGER}");
}

@ -44,43 +44,45 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"mem_name, mem_phone, ",
"mem_card_id, mem_card_type, ",
"mem_card_no, pay_model, ",
"pay_type, pay_gold, ",
"pay_price, pay_real_price, ",
"pay_serial_no, deduction_price, ",
"order_status, total_price, ",
"create_time, pay_time, ",
"cancel_time, cancel_remarks, ",
"finish_time, remarks, ",
"refund_no, refund_time, ",
"refund_price, refund_content, ",
"refusal_refund_content, Identification_code, ",
"profit_sharing_status, profit_sharing_ratio, ",
"account_merchant_num, product_type, ",
"print_status, print_num, ",
"whether_check, region_id, ",
"company_id, merch_id, ",
"ext_1, ext_2, ext_3)",
"pay_type, payable_price, ",
"pay_gold, pay_price, ",
"pay_real_price, pay_serial_no, ",
"deduction_price, order_status, ",
"total_price, create_time, ",
"pay_time, cancel_time, ",
"cancel_remarks, finish_time, ",
"remarks, refund_no, ",
"refund_time, refund_price, ",
"refund_content, refusal_refund_content, ",
"Identification_code, profit_sharing_status, ",
"profit_sharing_ratio, account_merchant_num, ",
"product_type, print_status, ",
"print_num, whether_check, ",
"region_id, company_id, ",
"merch_id, ext_1, ext_2, ",
"ext_3)",
"values (#{orderNo,jdbcType=VARCHAR}, #{memDiscountId,jdbcType=BIGINT}, ",
"#{memDiscountName,jdbcType=VARCHAR}, #{memId,jdbcType=BIGINT}, ",
"#{memName,jdbcType=VARCHAR}, #{memPhone,jdbcType=VARCHAR}, ",
"#{memCardId,jdbcType=BIGINT}, #{memCardType,jdbcType=INTEGER}, ",
"#{memCardNo,jdbcType=VARCHAR}, #{payModel,jdbcType=INTEGER}, ",
"#{payType,jdbcType=INTEGER}, #{payGold,jdbcType=INTEGER}, ",
"#{payPrice,jdbcType=DECIMAL}, #{payRealPrice,jdbcType=DECIMAL}, ",
"#{paySerialNo,jdbcType=VARCHAR}, #{deductionPrice,jdbcType=DECIMAL}, ",
"#{orderStatus,jdbcType=INTEGER}, #{totalPrice,jdbcType=DECIMAL}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ",
"#{cancelTime,jdbcType=TIMESTAMP}, #{cancelRemarks,jdbcType=VARCHAR}, ",
"#{finishTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, ",
"#{refundNo,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, ",
"#{refundPrice,jdbcType=DECIMAL}, #{refundContent,jdbcType=VARCHAR}, ",
"#{refusalRefundContent,jdbcType=VARCHAR}, #{identificationCode,jdbcType=BIGINT}, ",
"#{profitSharingStatus,jdbcType=BIT}, #{profitSharingRatio,jdbcType=DECIMAL}, ",
"#{accountMerchantNum,jdbcType=VARCHAR}, #{productType,jdbcType=INTEGER}, ",
"#{printStatus,jdbcType=BIT}, #{printNum,jdbcType=INTEGER}, ",
"#{whetherCheck,jdbcType=BIT}, #{regionId,jdbcType=VARCHAR}, ",
"#{companyId,jdbcType=BIGINT}, #{merchId,jdbcType=VARCHAR}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
"#{payType,jdbcType=INTEGER}, #{payablePrice,jdbcType=DECIMAL}, ",
"#{payGold,jdbcType=INTEGER}, #{payPrice,jdbcType=DECIMAL}, ",
"#{payRealPrice,jdbcType=DECIMAL}, #{paySerialNo,jdbcType=VARCHAR}, ",
"#{deductionPrice,jdbcType=DECIMAL}, #{orderStatus,jdbcType=INTEGER}, ",
"#{totalPrice,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ",
"#{cancelRemarks,jdbcType=VARCHAR}, #{finishTime,jdbcType=TIMESTAMP}, ",
"#{remarks,jdbcType=VARCHAR}, #{refundNo,jdbcType=VARCHAR}, ",
"#{refundTime,jdbcType=TIMESTAMP}, #{refundPrice,jdbcType=DECIMAL}, ",
"#{refundContent,jdbcType=VARCHAR}, #{refusalRefundContent,jdbcType=VARCHAR}, ",
"#{identificationCode,jdbcType=BIGINT}, #{profitSharingStatus,jdbcType=BIT}, ",
"#{profitSharingRatio,jdbcType=DECIMAL}, #{accountMerchantNum,jdbcType=VARCHAR}, ",
"#{productType,jdbcType=INTEGER}, #{printStatus,jdbcType=BIT}, ",
"#{printNum,jdbcType=INTEGER}, #{whetherCheck,jdbcType=BIT}, ",
"#{regionId,jdbcType=VARCHAR}, #{companyId,jdbcType=BIGINT}, ",
"#{merchId,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
"#{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(HighOrder record);
@ -103,6 +105,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
@Result(column="mem_card_no", property="memCardNo", jdbcType=JdbcType.VARCHAR),
@Result(column="pay_model", property="payModel", jdbcType=JdbcType.INTEGER),
@Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER),
@Result(column="payable_price", property="payablePrice", jdbcType=JdbcType.DECIMAL),
@Result(column="pay_gold", property="payGold", jdbcType=JdbcType.INTEGER),
@Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL),
@ -141,12 +144,13 @@ public interface HighOrderMapper extends HighOrderMapperExt {
@Select({
"select",
"id, order_no, mem_discount_id, mem_discount_name, mem_id, mem_name, mem_phone, ",
"mem_card_id, mem_card_type, mem_card_no, pay_model, pay_type, pay_gold, pay_price, ",
"pay_real_price, pay_serial_no, deduction_price, order_status, total_price, create_time, ",
"pay_time, cancel_time, cancel_remarks, finish_time, remarks, refund_no, refund_time, ",
"refund_price, refund_content, refusal_refund_content, Identification_code, profit_sharing_status, ",
"profit_sharing_ratio, account_merchant_num, product_type, print_status, print_num, ",
"whether_check, region_id, company_id, merch_id, ext_1, ext_2, ext_3",
"mem_card_id, mem_card_type, mem_card_no, pay_model, pay_type, payable_price, ",
"pay_gold, pay_price, pay_real_price, pay_serial_no, deduction_price, order_status, ",
"total_price, create_time, pay_time, cancel_time, cancel_remarks, finish_time, ",
"remarks, refund_no, refund_time, refund_price, refund_content, refusal_refund_content, ",
"Identification_code, profit_sharing_status, profit_sharing_ratio, account_merchant_num, ",
"product_type, print_status, print_num, whether_check, region_id, company_id, ",
"merch_id, ext_1, ext_2, ext_3",
"from high_order",
"where id = #{id,jdbcType=BIGINT}"
})
@ -163,6 +167,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
@Result(column="mem_card_no", property="memCardNo", jdbcType=JdbcType.VARCHAR),
@Result(column="pay_model", property="payModel", jdbcType=JdbcType.INTEGER),
@Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER),
@Result(column="payable_price", property="payablePrice", jdbcType=JdbcType.DECIMAL),
@Result(column="pay_gold", property="payGold", jdbcType=JdbcType.INTEGER),
@Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL),
@ -220,6 +225,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"mem_card_no = #{memCardNo,jdbcType=VARCHAR},",
"pay_model = #{payModel,jdbcType=INTEGER},",
"pay_type = #{payType,jdbcType=INTEGER},",
"payable_price = #{payablePrice,jdbcType=DECIMAL},",
"pay_gold = #{payGold,jdbcType=INTEGER},",
"pay_price = #{payPrice,jdbcType=DECIMAL},",
"pay_real_price = #{payRealPrice,jdbcType=DECIMAL},",

@ -72,6 +72,10 @@ public class HighOrderSqlProvider {
sql.VALUES("pay_type", "#{payType,jdbcType=INTEGER}");
}
if (record.getPayablePrice() != null) {
sql.VALUES("payable_price", "#{payablePrice,jdbcType=DECIMAL}");
}
if (record.getPayGold() != null) {
sql.VALUES("pay_gold", "#{payGold,jdbcType=INTEGER}");
}
@ -221,6 +225,7 @@ public class HighOrderSqlProvider {
sql.SELECT("mem_card_no");
sql.SELECT("pay_model");
sql.SELECT("pay_type");
sql.SELECT("payable_price");
sql.SELECT("pay_gold");
sql.SELECT("pay_price");
sql.SELECT("pay_real_price");
@ -318,6 +323,10 @@ public class HighOrderSqlProvider {
sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}");
}
if (record.getPayablePrice() != null) {
sql.SET("payable_price = #{record.payablePrice,jdbcType=DECIMAL}");
}
if (record.getPayGold() != null) {
sql.SET("pay_gold = #{record.payGold,jdbcType=INTEGER}");
}
@ -466,6 +475,7 @@ public class HighOrderSqlProvider {
sql.SET("mem_card_no = #{record.memCardNo,jdbcType=VARCHAR}");
sql.SET("pay_model = #{record.payModel,jdbcType=INTEGER}");
sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}");
sql.SET("payable_price = #{record.payablePrice,jdbcType=DECIMAL}");
sql.SET("pay_gold = #{record.payGold,jdbcType=INTEGER}");
sql.SET("pay_price = #{record.payPrice,jdbcType=DECIMAL}");
sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}");
@ -552,6 +562,10 @@ public class HighOrderSqlProvider {
sql.SET("pay_type = #{payType,jdbcType=INTEGER}");
}
if (record.getPayablePrice() != null) {
sql.SET("payable_price = #{payablePrice,jdbcType=DECIMAL}");
}
if (record.getPayGold() != null) {
sql.SET("pay_gold = #{payGold,jdbcType=INTEGER}");
}

@ -148,6 +148,11 @@ public class HighChildOrder implements Serializable {
*/
private BigDecimal gasPriceOfficial;
/**
* 加油站渠道支付金额
*/
private BigDecimal gasPriceChannelPay;
/**
* 加油站加油升数
*/
@ -458,6 +463,14 @@ public class HighChildOrder implements Serializable {
this.gasPriceOfficial = gasPriceOfficial;
}
public BigDecimal getGasPriceChannelPay() {
return gasPriceChannelPay;
}
public void setGasPriceChannelPay(BigDecimal gasPriceChannelPay) {
this.gasPriceChannelPay = gasPriceChannelPay;
}
public BigDecimal getGasOilLiters() {
return gasOilLiters;
}
@ -673,6 +686,7 @@ public class HighChildOrder implements Serializable {
&& (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.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()))
@ -728,6 +742,7 @@ public class HighChildOrder implements Serializable {
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 + ((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());
@ -786,6 +801,7 @@ public class HighChildOrder implements Serializable {
sb.append(", gasPriceGun=").append(gasPriceGun);
sb.append(", gasPriceVip=").append(gasPriceVip);
sb.append(", gasPriceOfficial=").append(gasPriceOfficial);
sb.append(", gasPriceChannelPay=").append(gasPriceChannelPay);
sb.append(", gasOilLiters=").append(gasOilLiters);
sb.append(", gasDiscount=").append(gasDiscount);
sb.append(", gasOilSubsidy=").append(gasOilSubsidy);

@ -1835,6 +1835,66 @@ public class HighChildOrderExample {
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<BigDecimal> values) {
addCriterion("gas_price_channel_pay in", values, "gasPriceChannelPay");
return (Criteria) this;
}
public Criteria andGasPriceChannelPayNotIn(List<BigDecimal> 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;

@ -58,6 +58,11 @@ public class HighGasOilPrice implements Serializable {
*/
private BigDecimal priceOfficial;
/**
* 成本价
*/
private BigDecimal priceCost;
/**
* 油品类型 1:汽油:2:柴油;3:天然气
*/
@ -153,6 +158,14 @@ public class HighGasOilPrice implements Serializable {
this.priceOfficial = priceOfficial;
}
public BigDecimal getPriceCost() {
return priceCost;
}
public void setPriceCost(BigDecimal priceCost) {
this.priceCost = priceCost;
}
public Integer getOilType() {
return oilType;
}
@ -222,6 +235,7 @@ public class HighGasOilPrice implements Serializable {
&& (this.getPriceVip() == null ? other.getPriceVip() == null : this.getPriceVip().equals(other.getPriceVip()))
&& (this.getPriceGun() == null ? other.getPriceGun() == null : this.getPriceGun().equals(other.getPriceGun()))
&& (this.getPriceOfficial() == null ? other.getPriceOfficial() == null : this.getPriceOfficial().equals(other.getPriceOfficial()))
&& (this.getPriceCost() == null ? other.getPriceCost() == null : this.getPriceCost().equals(other.getPriceCost()))
&& (this.getOilType() == null ? other.getOilType() == null : this.getOilType().equals(other.getOilType()))
&& (this.getOilTypeName() == null ? other.getOilTypeName() == null : this.getOilTypeName().equals(other.getOilTypeName()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
@ -243,6 +257,7 @@ public class HighGasOilPrice implements Serializable {
result = prime * result + ((getPriceVip() == null) ? 0 : getPriceVip().hashCode());
result = prime * result + ((getPriceGun() == null) ? 0 : getPriceGun().hashCode());
result = prime * result + ((getPriceOfficial() == null) ? 0 : getPriceOfficial().hashCode());
result = prime * result + ((getPriceCost() == null) ? 0 : getPriceCost().hashCode());
result = prime * result + ((getOilType() == null) ? 0 : getOilType().hashCode());
result = prime * result + ((getOilTypeName() == null) ? 0 : getOilTypeName().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
@ -267,6 +282,7 @@ public class HighGasOilPrice implements Serializable {
sb.append(", priceVip=").append(priceVip);
sb.append(", priceGun=").append(priceGun);
sb.append(", priceOfficial=").append(priceOfficial);
sb.append(", priceCost=").append(priceCost);
sb.append(", oilType=").append(oilType);
sb.append(", oilTypeName=").append(oilTypeName);
sb.append(", status=").append(status);

@ -675,6 +675,66 @@ public class HighGasOilPriceExample {
return (Criteria) this;
}
public Criteria andPriceCostIsNull() {
addCriterion("price_cost is null");
return (Criteria) this;
}
public Criteria andPriceCostIsNotNull() {
addCriterion("price_cost is not null");
return (Criteria) this;
}
public Criteria andPriceCostEqualTo(BigDecimal value) {
addCriterion("price_cost =", value, "priceCost");
return (Criteria) this;
}
public Criteria andPriceCostNotEqualTo(BigDecimal value) {
addCriterion("price_cost <>", value, "priceCost");
return (Criteria) this;
}
public Criteria andPriceCostGreaterThan(BigDecimal value) {
addCriterion("price_cost >", value, "priceCost");
return (Criteria) this;
}
public Criteria andPriceCostGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("price_cost >=", value, "priceCost");
return (Criteria) this;
}
public Criteria andPriceCostLessThan(BigDecimal value) {
addCriterion("price_cost <", value, "priceCost");
return (Criteria) this;
}
public Criteria andPriceCostLessThanOrEqualTo(BigDecimal value) {
addCriterion("price_cost <=", value, "priceCost");
return (Criteria) this;
}
public Criteria andPriceCostIn(List<BigDecimal> values) {
addCriterion("price_cost in", values, "priceCost");
return (Criteria) this;
}
public Criteria andPriceCostNotIn(List<BigDecimal> values) {
addCriterion("price_cost not in", values, "priceCost");
return (Criteria) this;
}
public Criteria andPriceCostBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("price_cost between", value1, value2, "priceCost");
return (Criteria) this;
}
public Criteria andPriceCostNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("price_cost not between", value1, value2, "priceCost");
return (Criteria) this;
}
public Criteria andOilTypeIsNull() {
addCriterion("oil_type is null");
return (Criteria) this;

@ -75,6 +75,11 @@ public class HighOrder implements Serializable {
*/
private Integer payType;
/**
* 应付金额
*/
private BigDecimal payablePrice;
/**
* 支付金币
*/
@ -223,6 +228,7 @@ public class HighOrder implements Serializable {
private String ext3;
private String payPwd;
private List<HighChildOrder> highChildOrderList;
@ -239,12 +245,14 @@ public class HighOrder implements Serializable {
*/
private Boolean buyPoints;
public String getGasStaffCode() {
return gasStaffCode;
private static final long serialVersionUID = 1L;
public String getPayPwd() {
return payPwd;
}
public void setGasStaffCode(String gasStaffCode) {
this.gasStaffCode = gasStaffCode;
public void setPayPwd(String payPwd) {
this.payPwd = payPwd;
}
public List<HighChildOrder> getHighChildOrderList() {
@ -271,7 +279,21 @@ public class HighOrder implements Serializable {
isTyAgent = tyAgent;
}
private static final long serialVersionUID = 1L;
public String getGasStaffCode() {
return gasStaffCode;
}
public void setGasStaffCode(String gasStaffCode) {
this.gasStaffCode = gasStaffCode;
}
public Boolean getBuyPoints() {
return buyPoints;
}
public void setBuyPoints(Boolean buyPoints) {
this.buyPoints = buyPoints;
}
public Long getId() {
return id;
@ -369,6 +391,14 @@ public class HighOrder implements Serializable {
this.payType = payType;
}
public BigDecimal getPayablePrice() {
return payablePrice;
}
public void setPayablePrice(BigDecimal payablePrice) {
this.payablePrice = payablePrice;
}
public Integer getPayGold() {
return payGold;
}
@ -625,6 +655,7 @@ public class HighOrder implements Serializable {
this.ext3 = ext3;
}
<<<<<<< HEAD
public String getPassword() {
return password;
}
@ -649,6 +680,8 @@ public class HighOrder implements Serializable {
this.buyPoints = buyPoints;
}
=======
>>>>>>> 848fcba6384da50fdbd18a8fcc2e19ac7c72a25a
@Override
public boolean equals(Object that) {
if (this == that) {
@ -673,6 +706,7 @@ public class HighOrder implements Serializable {
&& (this.getMemCardNo() == null ? other.getMemCardNo() == null : this.getMemCardNo().equals(other.getMemCardNo()))
&& (this.getPayModel() == null ? other.getPayModel() == null : this.getPayModel().equals(other.getPayModel()))
&& (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType()))
&& (this.getPayablePrice() == null ? other.getPayablePrice() == null : this.getPayablePrice().equals(other.getPayablePrice()))
&& (this.getPayGold() == null ? other.getPayGold() == null : this.getPayGold().equals(other.getPayGold()))
&& (this.getPayPrice() == null ? other.getPayPrice() == null : this.getPayPrice().equals(other.getPayPrice()))
&& (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice()))
@ -723,6 +757,7 @@ public class HighOrder implements Serializable {
result = prime * result + ((getMemCardNo() == null) ? 0 : getMemCardNo().hashCode());
result = prime * result + ((getPayModel() == null) ? 0 : getPayModel().hashCode());
result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode());
result = prime * result + ((getPayablePrice() == null) ? 0 : getPayablePrice().hashCode());
result = prime * result + ((getPayGold() == null) ? 0 : getPayGold().hashCode());
result = prime * result + ((getPayPrice() == null) ? 0 : getPayPrice().hashCode());
result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode());
@ -776,6 +811,7 @@ public class HighOrder implements Serializable {
sb.append(", memCardNo=").append(memCardNo);
sb.append(", payModel=").append(payModel);
sb.append(", payType=").append(payType);
sb.append(", payablePrice=").append(payablePrice);
sb.append(", payGold=").append(payGold);
sb.append(", payPrice=").append(payPrice);
sb.append(", payRealPrice=").append(payRealPrice);

@ -896,6 +896,66 @@ public class HighOrderExample {
return (Criteria) this;
}
public Criteria andPayablePriceIsNull() {
addCriterion("payable_price is null");
return (Criteria) this;
}
public Criteria andPayablePriceIsNotNull() {
addCriterion("payable_price is not null");
return (Criteria) this;
}
public Criteria andPayablePriceEqualTo(BigDecimal value) {
addCriterion("payable_price =", value, "payablePrice");
return (Criteria) this;
}
public Criteria andPayablePriceNotEqualTo(BigDecimal value) {
addCriterion("payable_price <>", value, "payablePrice");
return (Criteria) this;
}
public Criteria andPayablePriceGreaterThan(BigDecimal value) {
addCriterion("payable_price >", value, "payablePrice");
return (Criteria) this;
}
public Criteria andPayablePriceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("payable_price >=", value, "payablePrice");
return (Criteria) this;
}
public Criteria andPayablePriceLessThan(BigDecimal value) {
addCriterion("payable_price <", value, "payablePrice");
return (Criteria) this;
}
public Criteria andPayablePriceLessThanOrEqualTo(BigDecimal value) {
addCriterion("payable_price <=", value, "payablePrice");
return (Criteria) this;
}
public Criteria andPayablePriceIn(List<BigDecimal> values) {
addCriterion("payable_price in", values, "payablePrice");
return (Criteria) this;
}
public Criteria andPayablePriceNotIn(List<BigDecimal> values) {
addCriterion("payable_price not in", values, "payablePrice");
return (Criteria) this;
}
public Criteria andPayablePriceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("payable_price between", value1, value2, "payablePrice");
return (Criteria) this;
}
public Criteria andPayablePriceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("payable_price not between", value1, value2, "payablePrice");
return (Criteria) this;
}
public Criteria andPayGoldIsNull() {
addCriterion("pay_gold is null");
return (Criteria) this;

@ -14,6 +14,7 @@ public enum DiscountUseScope {
type4(4 , "肯德基"),
type5(5 , "星巴克"),
type6(6 , "会员充值"),
type7(7 , "加油服务"),
;
private Integer type;

@ -3,7 +3,7 @@ package com.hai.enum_type;
import java.util.Objects;
/**
* 金猪加油 油号枚举
* 油号枚举
*/
public enum JinZhuJiaYouOilNo {
@ -34,6 +34,13 @@ public enum JinZhuJiaYouOilNo {
return null;
}
public static JinZhuJiaYouOilNo getDataByOilNo(Integer oilNo) {
for (JinZhuJiaYouOilNo ele : values()) {
if(Objects.equals(oilNo,ele.getOilNo())) return ele;
}
return null;
}
public String getOilNoCode() {
return oilNoCode;
}

@ -0,0 +1,51 @@
package com.hai.enum_type;
import java.util.Objects;
/**
* 子订单商品类型
* @author hurui
*/
public enum OrderChildGoodsTypeEnum {
type1(1 , "卡券"),
type2(2 , "金币充值"),
type3(3 , "加油服务"),
type4(4 , "KFC"),
type5(5 , "电影票"),
type6(6 , "话费充值"),
type7(7 , "优惠券包"),
type8(8 , "贵州汇联通充值"),
;
private Integer type;
private String name;
OrderChildGoodsTypeEnum(int type , String name) {
this.type = type;
this.name = name;
}
public static OrderChildGoodsTypeEnum getDataByType(Integer type) {
for (OrderChildGoodsTypeEnum ele : values()) {
if(Objects.equals(type,ele.getType())) return ele;
}
return null;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}

@ -69,6 +69,13 @@ public interface HighOrderService {
*/
void updateOrderDetail(HighOrder highOrder);
/**
* 订单业务交易处理
* 注意支付完成后可以调用此方法
* @param order
*/
void orderBusinessTransaction(HighOrder order) throws Exception;
/**
* @Author 胡锐
* @Description 获取未完成的子订单数量

@ -297,7 +297,8 @@ public class HighGasServiceImpl implements HighGasService {
highGasOilPrice.setPreferentialMargin(new BigDecimal("0"));
highGasOilPrice.setGasStationDrop(oilPriceObject.getBigDecimal("guidancePrice").subtract(oilPriceObject.getBigDecimal("listingPrice")));
highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("merchantStrikePrice"));
highGasOilPrice.setPriceCost(oilPriceObject.getBigDecimal("merchantStrikePrice"));
highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("listingPrice"));
highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("listingPrice"));
highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("guidancePrice"));
highGasOilPriceService.editGasOilPrice(highGasOilPrice);
@ -321,7 +322,8 @@ public class HighGasServiceImpl implements HighGasService {
} else {
highGasOilPrice.setGasStationDrop(oilPriceObject.getBigDecimal("guidancePrice").subtract(oilPriceObject.getBigDecimal("listingPrice")));
highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("merchantStrikePrice"));
highGasOilPrice.setPriceCost(oilPriceObject.getBigDecimal("merchantStrikePrice"));
highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("listingPrice"));
highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("listingPrice"));
highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("guidancePrice"));
highGasOilPriceService.editGasOilPrice(highGasOilPrice);
@ -386,7 +388,8 @@ public class HighGasServiceImpl implements HighGasService {
highGasOilPrice.setPreferentialMargin(new BigDecimal("0"));
highGasOilPrice.setGasStationDrop(oilPriceObject.getBigDecimal("guidancePrice").subtract(oilPriceObject.getBigDecimal("listingPrice")));
highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("merchantStrikePrice"));
highGasOilPrice.setPriceCost(oilPriceObject.getBigDecimal("merchantStrikePrice"));
highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("listingPrice"));
highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("listingPrice"));
highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("guidancePrice"));

@ -165,6 +165,9 @@ public class HighOrderServiceImpl implements HighOrderService {
@Resource
private ShellGroupService shellGroupService;
@Resource
private JinZhuJiaYouService jinZhuJiaYouService;
@Override
@Transactional(
isolation = Isolation.SERIALIZABLE,
@ -258,6 +261,34 @@ public class HighOrderServiceImpl implements HighOrderService {
}
}
if (childOrder.getGoodsType() == 3) {
// 加油站详情
HighMerchantStore store = highMerchantStoreService.getDetailById(childOrder.getGoodsId());
if (store == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_ORDER, "");
}
if (store.getSourceType().equals(MerchantStoreSourceType.type4.getNumber())) {
// 查询金猪油品数据
JinZhuJiaYouOilNo jzOilNo = JinZhuJiaYouOilNo.getDataByOilNo(Integer.valueOf(childOrder.getGasOilNo()));
if (jzOilNo == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法提交订单,未知的油品");
}
// 创建金猪订单
JSONObject jzOrderObject = jinZhuJiaYouService.createOrder(highOrder.getOrderNo(),
highOrder.getTotalPrice(),
store.getStoreKey(),
jzOilNo.getOilNoCode(),
childOrder.getGasGunNo(),
highOrder.getMemPhone()
);
childOrder.setGasOrderNo(jzOrderObject.getJSONObject("data").getString("systemOrderNo"));
childOrder.setGasPriceChannelPay(jzOrderObject.getJSONObject("data").getBigDecimal("paymentAmount"));
highChildOrderMapper.updateByPrimaryKey(childOrder);
}
}
if (childOrder.getGoodsType() == 7) {
// 查询库存
List<HighDiscountPackageActual> list = discountPackageActualService.getListByPackageId(childOrder.getGoodsId().intValue(), 1);
@ -270,10 +301,56 @@ public class HighOrderServiceImpl implements HighOrderService {
discountPackageActualService.updateHighDiscountPackageActual(list.get(0));
}
}
// 积分抵扣,卡券除外
if (!highOrder.getHighChildOrderList().get(0).getGoodsType().equals(1) && highOrder.getPayGold() != null) {
// 积分转换成金额
BigDecimal goldPrice = new BigDecimal(highOrder.getPayGold().toString()).divide(new BigDecimal(100));
// 积分金额大于应付金额
if (goldPrice.compareTo(highOrder.getPayablePrice()) == 1) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "支付的积分金额大于支付金额");
}
// 积分金额小于应付金额
if (goldPrice.compareTo(highOrder.getPayablePrice()) == -1) {
// 应付金额 减去 积分抵扣金额 = 支付金额
highOrder.setPayPrice(highOrder.getPayablePrice().subtract(goldPrice));
updateOrderDetail(highOrder);
// 扣除用户积分
highUserService.goldHandle(highOrder.getMemId(), highOrder.getPayGold(), 2, 2, highOrder.getId());
}
// 积分金额等于应付金额
if (goldPrice.compareTo(highOrder.getPayablePrice()) == 0) {
if (StringUtils.isBlank(highOrder.getPayPwd())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_ENTER_USER_PAY_PWD, "");
}
// 查询用户密码
HighUserPayPassword userPayPwd = highUserPayPasswordService.getDetailByUser(highOrder.getMemId());
if (userPayPwd == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_SET_USER_PAY_PWD, "");
}
// 校验支付密码是否正确
if (userPayPwd.getPassword().equals(AESEncodeUtil.aesEncrypt(highOrder.getPayPwd()))) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.USER_PAY_PWD_ERROR, "");
}
// 扣除用户积分
highUserService.goldHandle(highOrder.getMemId(), highOrder.getPayGold(), 2, 2, highOrder.getId());
highOrder.setOrderStatus(OrderStatusEnum.type3.getType());
highOrder.setPayTime(new Date());
for (HighChildOrder childOrder : highOrder.getHighChildOrderList()) {
childOrder.setChildOrdeStatus(3);
}
updateOrder(highOrder);
// 订单完成业务处理
orderBusinessTransaction(highOrder);
}
}
public static void main(String[] args) {
System.out.println(HuiLianTongUnionCardConfig.resolveResponse("Gbkl57c3fEBg+E3HfPuQ52xYXxRnbPnT1CFoWj0AaUCBA2W/qzLuaUXplapIu/Avzt0AmzA/oCA=\\n"));
}
@Override
@ -483,14 +560,25 @@ public class HighOrderServiceImpl implements HighOrderService {
}
} else if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())) {
// 推送壳牌
JSONObject syncPayment = shellGroupService.gasSyncPayment(highOrder.getOrderNo(),
// 推送加好油
shellGroupService.gasSyncPayment(highOrder.getOrderNo(),
store.getStoreKey(),
highOrder.getPayTime(),
highChildOrder.getGasPriceGun(),
highChildOrder.getTotalPrice(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasGunNo(),
highOrder.getTotalPrice());
highOrder.getPayablePrice(),
highOrder.getDeductionPrice()
);
} else if (store.getSourceType().equals(MerchantStoreSourceType.type4.getNumber())) {
// 推送金猪加油
JSONObject jzOrderObject = jinZhuJiaYouService.payOrder(highOrder.getOrderNo(), highChildOrder.getGasPriceChannelPay());
if (jzOrderObject == null
|| !jzOrderObject.getString("type").equals("OK")
|| !jzOrderObject.getInteger("status").equals(200)) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jzOrderObject.getString("title"));
}
}
}
@ -759,14 +847,16 @@ public class HighOrderServiceImpl implements HighOrderService {
}
} else if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())) {
// 推送壳牌
JSONObject syncPayment = shellGroupService.gasSyncPayment(order.getOrderNo(),
// 推送加好油
shellGroupService.gasSyncPayment(order.getOrderNo(),
store.getStoreKey(),
order.getPayTime(),
highChildOrder.getGasPriceGun(),
highChildOrder.getTotalPrice(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasGunNo(),
order.getTotalPrice());
order.getPayablePrice(),
order.getDeductionPrice()
);
}
}
@ -1073,14 +1163,16 @@ public class HighOrderServiceImpl implements HighOrderService {
}
} else if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())) {
// 推送壳牌
JSONObject syncPayment = shellGroupService.gasSyncPayment(order.getOrderNo(),
// 推送加好油
shellGroupService.gasSyncPayment(order.getOrderNo(),
store.getStoreKey(),
order.getPayTime(),
highChildOrder.getGasPriceGun(),
highChildOrder.getTotalPrice(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasGunNo(),
order.getTotalPrice());
order.getPayablePrice(),
order.getDeductionPrice()
);
}
}
@ -1144,6 +1236,241 @@ public class HighOrderServiceImpl implements HighOrderService {
highOrderMapper.updateByPrimaryKey(highOrder);
}
@Override
public void orderBusinessTransaction(HighOrder order) throws Exception {
for (HighChildOrder highChildOrder : order.getHighChildOrderList()) {
// 商品类型 商品类型 1:卡卷 2:金币充值
if (highChildOrder.getGoodsType() == 1) {
highChildOrder.setChildOrdeStatus(2); // 子订单状态:1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消
HighCoupon coupon = highCouponService.getCouponById(highChildOrder.getGoodsId());
// 是否预约
if (coupon.getReserveStatus() == true) {
HighOrderPre orderPre = new HighOrderPre();
orderPre.setCompanyId(coupon.getCompanyId());
orderPre.setMerchantId(coupon.getMerchantId());
orderPre.setMerchantStoreId(highChildOrder.getStoreId());
orderPre.setPreOrderNo(System.currentTimeMillis() + "");
orderPre.setOrderId(order.getId());
orderPre.setOrderNo(order.getOrderNo());
orderPre.setChildOrderId(highChildOrder.getId());
orderPre.setPayRealPrice(order.getPayRealPrice());
orderPre.setGoodsType(1);
orderPre.setGoodsName(coupon.getCouponName());
orderPre.setGoodsId(coupon.getId());
orderPre.setPreUserId(order.getMemId());
orderPre.setPreUserName(order.getMemName());
orderPre.setPreUserPhone(order.getMemPhone());
orderPre.setPreUserRemark(order.getRemarks());
orderPre.setStatus(1);
highOrderPreService.insertOrderPre(orderPre);
}
// 贵州中石化
if (coupon.getCouponSource() == 4) {
Map<String, Object> push = new HashMap<>();
push.put("couTypeCode", coupon.getCouponKey());
push.put("distCouCount", highChildOrder.getSaleCount());
push.put("userPhone", order.getMemPhone());
push.put("thirdUserId", order.getMerchId());
// 推送给高速
JSONObject returnParam = HuiLianTongConfig.costRechargeOrder(highChildOrder.getExt2());
if (returnParam != null && returnParam.getString("respCode").equals("0000")) {
// 解密
JSONObject jsonObject = HuiLianTongUnionCardConfig.resolveResponse(returnParam.getString("data"));
JSONArray dataArray = JSONObject.parseObject(jsonObject.getString("data"), JSONArray.class);
for (Object data : dataArray) {
JSONObject dataObject = (JSONObject) data;
HighCouponCodeOther couponCodeOther = new HighCouponCodeOther();
couponCodeOther.setType(1);
couponCodeOther.setOrderId(order.getId());
couponCodeOther.setChildOrderId(highChildOrder.getId());
couponCodeOther.setCouTypeCode(dataObject.getString("couTypeCode"));
couponCodeOther.setCouNo(dataObject.getString("couNo"));
couponCodeOther.setActiveTime(dataObject.getDate("activeTime"));
couponCodeOther.setValidStartDate(dataObject.getDate("validStartDate"));
couponCodeOther.setValidEndDate(dataObject.getDate("validEndDate"));
couponCodeOther.setStatus(20);
couponCodeOther.setCreateTime(new Date());
highCouponCodeOtherMapper.insert(couponCodeOther);
// 卡卷关联用户
HighUserCoupon highUserCoupon = new HighUserCoupon();
highUserCoupon.setMerchantId(coupon.getMerchantId());
highUserCoupon.setCouponId(coupon.getId());
highUserCoupon.setUserId(order.getMemId());
highUserCoupon.setCreateTime(new Date());
highUserCoupon.setQrCodeImg(dataObject.getString("couNo"));
highUserCoupon.setUseEndTime(dataObject.getDate("validEndDate"));
highUserCoupon.setStatus(1); // 状态 0:已过期 1:未使用 2:已使用
highUserCouponMapper.insert(highUserCoupon);
}
}
// 推送记录
HighGasOrderPush highGasOrderPush = new HighGasOrderPush();
highGasOrderPush.setType(OrderPushType.type6.getType());
highGasOrderPush.setOrderNo(order.getOrderNo());
highGasOrderPush.setCreateTime(new Date());
highGasOrderPush.setCode(returnParam.getString("result"));
highGasOrderPush.setRequestContent(JSONObject.toJSONString(push));
highGasOrderPush.setReturnContent(returnParam.toJSONString());
highGasOrderPushMapper.insert(highGasOrderPush);
} else {
HighCouponCode code = highCouponCodeService.getCouponCodeByOrderId(highChildOrder.getId());
code.setStatus(2); // 状态:1.待销售 2.未使用 3.已使用 99.预支付
code.setReceiveTime(new Date());
highCouponCodeService.updateCouponCode(code);
// 卡卷关联用户
HighUserCoupon highUserCoupon = new HighUserCoupon();
highUserCoupon.setMerchantId(code.getMerchantId());
highUserCoupon.setCouponId(code.getCouponId());
highUserCoupon.setUserId(order.getMemId());
highUserCoupon.setCouponCodeId(code.getId());
highUserCoupon.setCreateTime(new Date());
highUserCoupon.setQrCodeImg(code.getExt1());
// 计算使用有效期
Calendar userEndTime = Calendar.getInstance();
userEndTime.setTime(new Date());
userEndTime.set(Calendar.HOUR_OF_DAY, 23);
userEndTime.set(Calendar.MINUTE, 59);
userEndTime.set(Calendar.SECOND, 59);
userEndTime.add(Calendar.DATE, coupon.getRecycleDay());
if (userEndTime.getTime().compareTo(code.getUseEndTime()) == 1) {
highUserCoupon.setUseEndTime(code.getUseEndTime());
} else {
highUserCoupon.setUseEndTime(userEndTime.getTime());
}
highUserCoupon.setStatus(1); // 状态 0:已过期 1:未使用 2:已使用
highUserCouponMapper.insert(highUserCoupon);
}
// 查询卡券是否有活动
Map<String, Object> activity = highActivityInfoService.getNewActivityByCouponId(coupon.getId());
if (activity != null && MapUtils.getLong(activity, "id") != null) {
highActivityUserLotteryNumService.addLotteryNum(MapUtils.getLong(activity, "id"), order.getMemId(), 1);
}
}
if (highChildOrder.getGoodsType() == 2) {
highChildOrder.setChildOrdeStatus(3); // 子订单状态:1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消
// 金币 1:100
Integer goldNum = new BigDecimal(highChildOrder.getTotalPrice().toString()).multiply(new BigDecimal("100")).intValue();
highUserService.goldHandle(highChildOrder.getGoodsId(), goldNum, 1, 1, highChildOrder.getId());
}
if (highChildOrder.getGoodsType() == 3) {
highChildOrder.setChildOrdeStatus(3);
order.setOrderStatus(3);
HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(highChildOrder.getGoodsId());
// 来源类型 1:平台自建 2:团油
if (store.getSourceType().equals(1)) {
// 预存类型 0:非预存 1:预存门店
if (store.getPrestoreType() != null && store.getPrestoreType().equals(1)) {
Map<String, Object> pushParam = new HashMap<>();
pushParam.put("businessType", MerStoreAmountTypeEnum.type2.getType());
pushParam.put("storeId", highChildOrder.getGoodsId());
pushParam.put("price", order.getTotalPrice());
pushParam.put("sourceType", MerStoreAmountSourceTypeEnum.type2.getType());
pushParam.put("sourceId", order.getId());
pushParam.put("sourceContent", "订单号:" + order.getOrderNo() + ",加油金额:¥" + order.getTotalPrice());
pushParam.put("opUserId", order.getMemId());
pushParam.put("opUserName", order.getMemName());
// 扣预存款
this.redisTemplate.boundListOps(MsgTopic.MerStoreAccount.getName()).leftPush(pushParam);
}
} else if (store.getSourceType().equals(2)) {
// 推送团油订单
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("gasId", store.getStoreKey());
paramMap.put("oilNo", highChildOrder.getGasOilNo());
paramMap.put("gunNo", highChildOrder.getGasGunNo());
BigDecimal priceGun = highChildOrder.getGasPriceGun();
BigDecimal priceVip = highChildOrder.getGasPriceVip();
paramMap.put("priceGun", priceGun); // 枪单价
paramMap.put("priceVip", priceVip); // 优惠价
paramMap.put("driverPhone", order.getMemPhone());
paramMap.put("thirdSerialNo", order.getOrderNo());
paramMap.put("refuelingAmount", highChildOrder.getTotalPrice());
// 油品类型 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);
// 推送团油订单记录
HighGasOrderPush highGasOrderPush = new HighGasOrderPush();
highGasOrderPush.setType(OrderPushType.type1.getType());
highGasOrderPush.setOrderNo(order.getOrderNo());
highGasOrderPush.setCreateTime(new Date());
highGasOrderPush.setCode(orderPushObject.getString("code"));
highGasOrderPush.setRequestContent(JSONObject.toJSONString(paramMap));
highGasOrderPush.setReturnContent(orderPushObject.toJSONString());
highGasOrderPushMapper.insert(highGasOrderPush);
if (orderPushObject != null && orderPushObject.getString("code").equals("200")) {
highChildOrder.setGasOrderNo(orderPushObject.getJSONObject("result").getString("orderNo"));
}
} else if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())) {
// 推送加好油
shellGroupService.gasSyncPayment(order.getOrderNo(),
store.getStoreKey(),
order.getPayTime(),
highChildOrder.getTotalPrice(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasGunNo(),
order.getPayablePrice(),
order.getDeductionPrice()
);
} else if (store.getSourceType().equals(MerchantStoreSourceType.type4.getNumber())) {
// 推送金猪加油
JSONObject jzOrderObject = jinZhuJiaYouService.payOrder(order.getOrderNo(), highChildOrder.getGasPriceChannelPay());
if (jzOrderObject == null
|| !jzOrderObject.getString("type").equals("OK")
|| !jzOrderObject.getInteger("status").equals(200)) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jzOrderObject.getString("title"));
}
}
}
if (highChildOrder.getGoodsType() == 7) {
HighDiscountPackageActual actual = discountPackageActualService.getDetailByChildOrderId(highChildOrder.getId());
if (actual != null) {
List<HighDiscountPackageDiscountActual> discountList = discountPackageDiscountActualService.getHighDiscountPackageDiscountActualList(actual.getId());
for (HighDiscountPackageDiscountActual discount : discountList) {
highDiscountUserRelService.receiveDiscount(order.getMemId(), discount.getAgentDiscountCodeId());
}
HighDiscountPackage discountPackage = discountPackageService.findDiscountPackageById(actual.getDiscountPackageId());
HighDiscountPackageRecord record = new HighDiscountPackageRecord();
record.setDiscountPackageId(discountPackage.getId());
record.setDiscountPackageTitle(discountPackage.getTitle());
record.setUsingAttribution(discountPackage.getUsingAttribution());
record.setCompanyId(discountPackage.getCompanyId());
record.setOrderId(order.getId().intValue());
record.setChildOrderId(highChildOrder.getId().intValue());
record.setRecordNo(System.currentTimeMillis() + "");
record.setSalesType(1);
record.setPrice(order.getPayPrice());
record.setUserId(order.getMemId().intValue());
discountPackageRecordService.insertRecord(record);
actual.setAllocationTime(new Date());
actual.setStatus(3); // 状态: 1: 待分配 2:预分配(售卖)3:已分配
discountPackageActualService.updateHighDiscountPackageActual(actual);
}
}
}
}
@Override
public Integer getUndoneChildOrder(Long orderId) {
HighOrder order = getOrderById(orderId);

@ -343,14 +343,16 @@ public class GoodsOrderServiceImpl implements PayService {
}
} else if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())) {
// 推送壳牌
JSONObject syncPayment = shellGroupService.gasSyncPayment(order.getOrderNo(),
// 推送加好油
shellGroupService.gasSyncPayment(order.getOrderNo(),
store.getStoreKey(),
order.getPayTime(),
highChildOrder.getGasPriceGun(),
highChildOrder.getTotalPrice(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasGunNo(),
order.getTotalPrice());
order.getPayablePrice(),
order.getDeductionPrice()
);
}
}

@ -9,10 +9,15 @@ tuanYouDieselAccount=c009bidg4400
tuanYouGasolineAccount=c009bic04400
# JiaHaoYou configuration parameters
shellGroupUrl=http://api.shenmapay.com/gateway.html
shellGroupPartnerId=S0302208021401950202
shellPlatMerchantId=S0302206141001919666
shellPlatMerchantKey=pic1yj2l3zby5ywpznrtdz7458ce2soj
shellGroupUrl=http://openapi.ngrok.xinyebang.cn/gateway.html
shellGroupPartnerId=S0302207281600105753
shellPlatMerchantId=S0302206141000105717
shellPlatMerchantKey=wqisfmkzea6mwd7ogbyh3488jv0hqhdj
# JinZhu configuration parameters
jzAppId=app_huidui_prod_01
jzPrivateKeyUrl=/home/project/hsg/fileKey/JzPrivateKey.key
jzPublicKeyUrl=/home/project/hsg/fileKey/JzPublicKey.key
# ????
qinzhuUrl=https://live-test.qianzhu8.com

@ -14,6 +14,11 @@ shellGroupPartnerId=S0302207281600105753
shellPlatMerchantId=S0302206141000105717
shellPlatMerchantKey=wqisfmkzea6mwd7ogbyh3488jv0hqhdj
# JinZhu configuration parameters
jzAppId=app_xiaohan_test_01
jzPrivateKeyUrl=/home/project/hsg/fileKey/JzPrivateKey.key
jzPublicKeyUrl=/home/project/hsg/fileKey/JzPublicKey.key
qinzhuUrl=https://live.qianzhu8.com
qinzhuUrlToken=https://live.qianzhu8.com/gateway
qinzhuHtmlUrl=https://qz.dctpay.com

@ -17,6 +17,11 @@ shellGroupPartnerId=S0302208021401950202
shellPlatMerchantId=S0302206141001919666
shellPlatMerchantKey=pic1yj2l3zby5ywpznrtdz7458ce2soj
# JinZhu configuration parameters
jzAppId=app_huidui_prod_01
jzPrivateKeyUrl=/home/project/hsg/fileKey/JzPrivateKey.key
jzPublicKeyUrl=/home/project/hsg/fileKey/JzPublicKey.key
qinzhuUrl=https://live.qianzhu8.com
qinzhuUrlToken=https://live.qianzhu8.com/gateway
qinzhuHtmlUrl=https://qz.dctpay.com

@ -17,6 +17,11 @@ shellGroupPartnerId=S0302208021401950202
shellPlatMerchantId=S0302206141001919666
shellPlatMerchantKey=pic1yj2l3zby5ywpznrtdz7458ce2soj
# JinZhu configuration parameters
jzAppId=app_huidui_prod_01
jzPrivateKeyUrl=/home/project/hsg/fileKey/JzPrivateKey.key
jzPublicKeyUrl=/home/project/hsg/fileKey/JzPublicKey.key
qinzhuUrl=https://live.qianzhu8.com
qinzhuUrlToken=https://live.qianzhu8.com/gateway
qinzhuHtmlUrl=https://qz.dctpay.com

Loading…
Cancel
Save