|
@@ -220,6 +220,7 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
|
|
|
String sign = PayUtil.getPaySign(json, PayUtil.merKey);
|
|
|
json.put("sign", sign);
|
|
|
// 私钥加密
|
|
|
+ log.info("发送参数 json:" + json);
|
|
|
String data = RSAUtil.privateEncrypt(json.toJSONString(), PayUtil.merKey);
|
|
|
// 提交
|
|
|
result = PayUtil.httpGet("https://platform.mhxxkj.com/paygateway/mbpay/order/v1", PayUtil.merAccount, data);
|
|
@@ -507,6 +508,7 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
|
|
|
String sign = PayUtil.getPaySign(json, PayUtil.merKey);
|
|
|
json.put("sign", sign);
|
|
|
// 私钥加密
|
|
|
+ log.info("发送参数 json:" + json);
|
|
|
String data = RSAUtil.privateEncrypt(json.toJSONString(), PayUtil.merKey);
|
|
|
// 提交
|
|
|
result = PayUtil.httpGet("https://platform.mhxxkj.com/paygateway/mbpay/order/v1", PayUtil.merAccount, data);
|
|
@@ -736,6 +738,7 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
|
|
|
|
|
|
/**
|
|
|
* 微信买优惠券
|
|
|
+ *
|
|
|
* @param payCouponDto
|
|
|
* @param headers
|
|
|
* @return
|
|
@@ -799,6 +802,9 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
|
|
|
payParam.setPayType("GATEWAY_UNIONPAY");
|
|
|
// 获取会员套餐价格
|
|
|
Double price = payOrderMapper.getCouponPrice(payCouponDto.getCouponId());
|
|
|
+ if("ENTERPRISE".equals(payCouponDto.getUserType())&&price<=8){
|
|
|
+ return ResponseJson.error("企业网银支付金额低于手续费!",null);
|
|
|
+ }
|
|
|
payParam.setPayAmount(MathUtil.mul(price, 100).intValue());
|
|
|
payParam.setNotifyUrl(couponUrl);
|
|
|
CouponRecordPo cr = new CouponRecordPo();
|
|
@@ -841,14 +847,15 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
|
|
|
Map<String, String> map = new HashMap<>(3);
|
|
|
map.put("subUserNo", PayUtil.publicAccountNo);
|
|
|
// 1按比例分账
|
|
|
- map.put("splitBillType","1");
|
|
|
+ map.put("splitBillType", "1");
|
|
|
// 1比例值总额
|
|
|
- map.put("splitBillValue","1");
|
|
|
+ map.put("splitBillValue", "1");
|
|
|
list.add(map);
|
|
|
String splitBillDetail = JSONObject.toJSONString(list);
|
|
|
json.put("splitBillDetail", splitBillDetail);
|
|
|
String sign = PayUtil.getPaySign(json, PayUtil.merKey);
|
|
|
json.put("sign", sign);
|
|
|
+ log.info("发送参数 json:" + json);
|
|
|
// 私钥加密
|
|
|
String data = RSAUtil.privateEncrypt(json.toJSONString(), PayUtil.merKey);
|
|
|
// 提交
|