Skip to content

V
volunteer_service
Commit 68e4e8f4 authored by cy's avatar cy
Browse files
Options

添加充值卡判断

parent 810456e8
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/RefillCardServiceImpl.java
View file @ 68e4e8f4
...@@ -58,7 +58,7 @@ public class RefillCardServiceImpl implements RefillCardService { ...@@ -58,7 +58,7 @@ public class RefillCardServiceImpl implements RefillCardService {
List<RefillCard> refillCards = refillCardMapper.infoByCardNo(cardNumber); List<RefillCard> refillCards = refillCardMapper.infoByCardNo(cardNumber);
if(refillCards.size()>0){ if(refillCards.size()>0){
RefillCard card = refillCards.stream().max(Comparator.comparing(RefillCard::getCardNo)).get(); RefillCard card = refillCards.stream().max(Comparator.comparing(RefillCard::getCardNo)).get();
BigInteger maxNo = refillCard.getCardNo().add(new BigInteger(card.getCardNumber().toString())); BigInteger maxNo = refillCard.getCardNo().add(new BigInteger((card.getCardNumber()-1)+""));
if (maxNo.compareTo(refillCard.getCardNo()) > 0) { if (maxNo.compareTo(refillCard.getCardNo()) > 0) {
return R.error("该初始卡区间有可能存在相同的卡号，请重新添加"); return R.error("该初始卡区间有可能存在相同的卡号，请重新添加");
} }
......
wisenergy-service/src/main/java/cn/wisenergy/service/common/Common.java
View file @ 68e4e8f4
...@@ -39,24 +39,24 @@ public class Common { ...@@ -39,24 +39,24 @@ public class Common {
* 支付宝--回调地址 * 支付宝--回调地址
*/ */
//测试 //测试
//public static final String NOTIFY_URL = "http://111.203.232.171:8997/pay/aliPayCallBack.do"; public static final String NOTIFY_URL = "http://111.203.232.171:8997/pay/aliPayCallBack.do";
//线上 //线上
public static final String NOTIFY_URL = "https://jygkzy.com/api/pay/aliPayCallBack.do"; //public static final String NOTIFY_URL = "https://jygkzy.com/api/pay/aliPayCallBack.do";
/*** /***
* 支付宝--pc端支付成功跳转地址 * 支付宝--pc端支付成功跳转地址
*/ */
//测试 //测试
//public static final String RETURN_URL_PC = "http://111.203.232.171:8999/#/wallet"; public static final String RETURN_URL_PC = "http://111.203.232.171:8999/#/wallet";
//线上 //线上
public static final String RETURN_URL_PC = "https://jygkzy.com/#/wallet"; //public static final String RETURN_URL_PC = "https://jygkzy.com/#/wallet";
/*** /***
* 支付宝--手机网页支付成功跳转地址 * 支付宝--手机网页支付成功跳转地址
*/ */
//测试 //测试
//public static final String RETURN_URL_WAP = "http://111.203.232.171:8999/#/history"; public static final String RETURN_URL_WAP = "http://111.203.232.171:8999/#/history";
//线上 //线上
public static final String RETURN_URL_WAP = "https://jygkzy.com/#/history"; //public static final String RETURN_URL_WAP = "https://jygkzy.com/#/history";
/** /**
......
wisenergy-service/src/main/java/cn/wisenergy/service/wxpay/WxCommon.java
View file @ 68e4e8f4
...@@ -9,9 +9,9 @@ package cn.wisenergy.service.wxpay; ...@@ -9,9 +9,9 @@ package cn.wisenergy.service.wxpay;
public class WxCommon { public class WxCommon {
//测试 //测试
//public static final String NOTIFY_URL = "http://111.203.232.171:8997/pay/wxPayCallBack.do"; public static final String NOTIFY_URL = "http://111.203.232.171:8997/pay/wxPayCallBack.do";
//线上 //线上
public static final String NOTIFY_URL = "https://jygkzy.com/api/pay/wxPayCallBack.do"; //public static final String NOTIFY_URL = "https://jygkzy.com/api/pay/wxPayCallBack.do";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment