Skip to content

Y
youka-api
Commit 00b763b3 by tang
Options

去除部分无效引用等

parent cfc158f6
Showing with 191 additions and 164 deletions
src/main/java/com/thinkgem/jeesite/modules/pay/api/BenefitController.java
......@@ -8,7 +8,6 @@ import com.thinkgem.jeesite.modules.pay.bean.OrderRequest;
import com.thinkgem.jeesite.modules.pay.entity.BalanceEntity;
import com.thinkgem.jeesite.modules.pay.entity.BenefitEntity;
import com.thinkgem.jeesite.modules.pay.service.BenefitSevice;
import com.thinkgem.jeesite.modules.user.bean.UserRequest;
import com.thinkgem.jeesite.modules.user.entity.UserEntity;
import com.thinkgem.jeesite.modules.user.service.UserApiService;
import org.springframework.beans.factory.annotation.Autowired;
......
src/main/java/com/thinkgem/jeesite/modules/pay/api/OrderApiController.java
......@@ -8,6 +8,8 @@ import com.thinkgem.jeesite.modules.pay.entity.OrderEntity;
import com.thinkgem.jeesite.modules.pay.service.OrderService;
import com.thinkgem.jeesite.modules.sys.entity.Dict;
import com.thinkgem.jeesite.modules.sys.service.DictService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.method.P;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -24,6 +26,8 @@ import java.util.List;
@RestController
@RequestMapping("/api/order")
public class OrderApiController {
/** log */
private static Logger logger = LoggerFactory.getLogger(OrderApiController.class);
@Autowired
private OrderService orderService;
......@@ -46,8 +50,7 @@ public class OrderApiController {
}
try {
System.out.println("开始时间：" + request.getStartDate());
System.out.println("结束时间：" + request.getEndDate());
logger.debug("获取订单列表的开始时间： {} , 结束时间： {}",request.getStartDate(), request.getEndDate());
List<OrderEntity> list = orderService.getOrderList(request);
res.setData(list);
......@@ -78,9 +81,7 @@ public class OrderApiController {
}
try {
System.out.println("开始时间：" + request.getStartDate());
System.out.println("结束时间：" + request.getEndDate());
logger.debug("获取订单列表的开始时间： {} , 结束时间： {}",request.getStartDate(), request.getEndDate());
res.setData(orderService.getOrderPage(request));
res.setStatus(ComCode.STATUS_CODE_2000);
res.setMessage(ComCode.STATUS_CODE_2000_DESC);
......
src/main/java/com/thinkgem/jeesite/modules/pay/api/PayApiController.java
package com.thinkgem.jeesite.modules.pay.api;
import com.google.common.collect.Maps;
import com.thinkgem.jeesite.common.baseBean.Request;
import com.thinkgem.jeesite.common.baseBean.Response;
import com.thinkgem.jeesite.common.constant.ComCode;
......@@ -41,7 +40,9 @@ import java.util.*;
@RestController
@RequestMapping("/api/pay")
public class PayApiController {
/** log */
/**
* log
*/
private static Logger logger = LoggerFactory.getLogger(PayApiController.class);
@Autowired
private PayApiService payService;
......@@ -64,22 +65,22 @@ public class PayApiController {
try {
PayBackDto payBackDto = payService.quickPay(request);
if((payBackDto.getUrl()!=null && !"".equals(payBackDto.getUrl())) || "0".equals(payBackDto.getIsUrl()) ){
if ((payBackDto.getUrl() != null && !"".equals(payBackDto.getUrl())) || "0".equals(payBackDto.getIsUrl())) {
resp.setStatus(ComCode.STATUS_CODE_2000);
resp.setMessage(ComCode.STATUS_CODE_2000_DESC);
resp.setData(payBackDto);
}else{
} else {
resp.setStatus(ComCode.STATUS_CODE_9998);
resp.setMessage(payBackDto.getMessage());
resp.setData(payBackDto);
}
} catch (MyException e){
} catch (MyException e) {
resp.setStatus(ComCode.STATUS_CODE_9998);
resp.setMessage(e.getMessage());
resp.setError(e.getMessage());
}catch (Exception e) {
} catch (Exception e) {
resp.setStatus(ComCode.STATUS_CODE_9998);
resp.setMessage(ComCode.STATUS_CODE_9998_DESC);
resp.setError(e.getMessage());
......@@ -99,15 +100,15 @@ public class PayApiController {
public Response aliPay(JuHeZhongPayRequest request) {
Response resp = new Response();
try {
logger.debug("支付宝升级等级level: {}",request.getLevel());
if("B".equals(request.getLevel())){
if(StringUtils.isBlank(request.getAfterMobile())){
logger.debug("支付宝升级等级level: {}", request.getLevel());
if ("B".equals(request.getLevel())) {
if (StringUtils.isBlank(request.getAfterMobile())) {
resp.setStatus(ComCode.STATUS_CODE_4001);
resp.setMessage(ComCode.STATUS_CODE_4001_DESC);
return resp;
}
UserEntity userEntity = userApiService.checkMobile(request.getAfterMobile());
if(userEntity != null){
if (userEntity != null) {
resp.setStatus(ComCode.STATUS_CODE_4007);
resp.setMessage(ComCode.STATUS_CODE_4007_DESC);
return resp;
......@@ -117,7 +118,7 @@ public class PayApiController {
resp.setStatus(ComCode.STATUS_CODE_2000);
resp.setMessage(ComCode.STATUS_CODE_2000_DESC);
resp.setData(payBackDto);
}catch (Exception e) {
} catch (Exception e) {
resp.setStatus(ComCode.STATUS_CODE_9998);
resp.setMessage(ComCode.STATUS_CODE_9998_DESC);
resp.setError(e.getMessage());
......@@ -125,6 +126,7 @@ public class PayApiController {
}
return resp;
}
/**
* 开卡 目前仅仅jfen通道需要请求这个接口 如果还有其他通道开卡请加上通道另外的判断
*
......@@ -134,7 +136,7 @@ public class PayApiController {
@PostMapping("/openCard")
public Response openCard(UserRequest request) {
Response resp = new Response();
if(ComCode.PAYCHANNEL_HL2.equals(request.getPayChannel())){ // 目前仅仅jfen通道需要请求这个接口 如果还有其他通道开卡请加上通道的判断
if (ComCode.PAYCHANNEL_HL2.equals(request.getPayChannel())) { // 目前仅仅jfen通道需要请求这个接口 如果还有其他通道开卡请加上通道的判断
return payService.openCardJFen(request);
}
resp.setMessage("没有该渠道");
......@@ -151,7 +153,7 @@ public class PayApiController {
@PostMapping("/sendMessagePay")
public Response sendMessagePay(JuHeZhongPayRequest request) {
Response resp = new Response();
if(ComCode.PAYCHANNEL_HL2.equals(request.getPayChannel())){ // 目前仅仅jfen通道需要请求这个接口 如果还有其他通道发送验证码请加上通道的判断
if (ComCode.PAYCHANNEL_HL2.equals(request.getPayChannel())) { // 目前仅仅jfen通道需要请求这个接口 如果还有其他通道发送验证码请加上通道的判断
try {
return payService.sendMessageJFen(request);
} catch (MyException e) {
......@@ -176,7 +178,7 @@ public class PayApiController {
Response resp = new Response();
try {
return payService.putForward(request);
}catch (Exception e){
} catch (Exception e) {
resp.setMessage(ComCode.STATUS_CODE_9998_DESC);
resp.setStatus(ComCode.STATUS_CODE_9998);
resp.setError(e.getMessage());
......@@ -197,7 +199,7 @@ public class PayApiController {
try {
resp.setData(payService.queryForward(request.getPayNo()));
resp.setStatus(ComCode.STATUS_CODE_2000);
}catch (Exception e){
} catch (Exception e) {
resp.setMessage(ComCode.STATUS_CODE_9998_DESC);
resp.setStatus(ComCode.STATUS_CODE_9998);
resp.setError(e.getMessage());
......@@ -209,15 +211,15 @@ public class PayApiController {
/**
* juhezhong快捷支付的回调
*
* @param request
* @param response
*/
@RequestMapping("/notifyPay")
public void notifyPay(HttpServletRequest request, HttpServletResponse response) {
System.out.println("。。。。。。回调。。。。。");
logger.debug("HL2回调开始");
Response responseRetrun = new Response();
Map map=request.getParameterMap();
Map map = request.getParameterMap();
printNotifyParam(map);
// Set keSet=map.entrySet();
// for(Iterator itr = keSet.iterator(); itr.hasNext();){
......@@ -243,11 +245,11 @@ public class PayApiController {
e.printStackTrace();
}
String orderId=request.getParameter("orderId");
String orderId = request.getParameter("orderId");
String code = request.getParameter("code");
logger.debug("HL2回调信息, 订单ID : {} , code:{}", orderId, code);
if("0000".equals(code)){
System.out.println("orderId:"+orderId);
if ("0000".equals(code)) {
logger.debug("orderId: {}", orderId);
OrderEntity orderEntity = new OrderEntity();
orderEntity.setPayCode(orderId);
......@@ -259,7 +261,7 @@ public class PayApiController {
}
//返回true 收到请求，停止通知
PrintWriter write= null;
PrintWriter write = null;
try {
write = response.getWriter();
} catch (IOException e) {
......@@ -279,14 +281,15 @@ public class PayApiController {
/**
* juhezhongHL4快捷支付的回调
*
* @param request
* @param response
*/
@RequestMapping("/notifyQuickPay")
public void notifyQuickPay(HttpServletRequest request, HttpServletResponse response) {
logger.debug("H4通道：quickPay支付回调");
logger.debug("H4通道：quickPay支付回调");
Response responseRetrun = new Response();
Map map=request.getParameterMap();
Map map = request.getParameterMap();
printNotifyParam(map);
// Set keSet=map.entrySet();
// for(Iterator itr = keSet.iterator(); itr.hasNext();){
......@@ -312,11 +315,11 @@ public class PayApiController {
e.printStackTrace();
}
String orderId=request.getParameter("orderId");
String orderId = request.getParameter("orderId");
String code = request.getParameter("code");
logger.debug("HL4回调信息, 订单ID : {} , code:{}", orderId, code);
if("0000".equals(code)){
System.out.println("quick pay orderId:"+orderId);
if ("0000".equals(code)) {
logger.debug("quick pay orderId: {}", orderId);
OrderEntity orderEntity = new OrderEntity();
orderEntity.setPayCode(orderId);
......@@ -328,7 +331,7 @@ public class PayApiController {
}
//返回true 收到请求，停止通知
PrintWriter write= null;
PrintWriter write = null;
try {
write = response.getWriter();
} catch (IOException e) {
......@@ -348,6 +351,7 @@ public class PayApiController {
/**
* Huanqiuhuiju快捷支付的回调
*
* @param request
* @param response
*/
......@@ -355,7 +359,7 @@ public class PayApiController {
public void notifyHuanqiuhuijuPay(HttpServletRequest request, HttpServletResponse response) {
logger.debug("Huanqiuhuiju快捷支付的回调开始");
Response responseRetrun = new Response();
Map map=request.getParameterMap();
Map map = request.getParameterMap();
printNotifyParam(map);
// Set keSet=map.entrySet();
// for(Iterator itr = keSet.iterator(); itr.hasNext();){
......@@ -381,10 +385,10 @@ public class PayApiController {
e.printStackTrace();
}
String orderId=request.getParameter("dsorderid");
String orderId = request.getParameter("dsorderid");
String code = request.getParameter("respCode");
if("00".equals(code)){
System.out.println("orderId:"+orderId);
if ("00".equals(code)) {
logger.debug("orderId: {}",orderId);
OrderEntity orderEntity = new OrderEntity();
orderEntity.setPayCode(orderId);
......@@ -396,7 +400,7 @@ public class PayApiController {
}
//返回true 收到请求，停止通知
PrintWriter write= null;
PrintWriter write = null;
try {
write = response.getWriter();
} catch (IOException e) {
......@@ -417,13 +421,14 @@ public class PayApiController {
/**
* 开卡的回调
*
* @param request
* @param response
*/
@RequestMapping("/openCardCallback")
public void openCardCallback(HttpServletRequest request, HttpServletResponse response) {
logger.debug("。。。。。。openCardCallback回调。。。。。");
Map map=request.getParameterMap();
Map map = request.getParameterMap();
printNotifyParam(map);
// Set keSet=map.entrySet();
// for(Iterator itr = keSet.iterator(); itr.hasNext();){
......@@ -449,11 +454,11 @@ public class PayApiController {
e.printStackTrace();
}
String swpaccid=request.getParameter("swpaccid");
String swpaccid = request.getParameter("swpaccid");
String cardNo = request.getParameter("cardNo");
String phone=request.getParameter("phone");
String phone = request.getParameter("phone");
String code = request.getParameter("code");
if("0000".equals(code)){
if ("0000".equals(code)) {
CardEntity cardEntity = new CardEntity();
cardEntity.setCardNo(cardNo);
cardEntity.setCardMobile(phone);
......@@ -465,7 +470,7 @@ public class PayApiController {
cardSwpaccidEntity.setCardCode(cardEntity.getCode());
userApiService.addSwpaccid(cardSwpaccidEntity);
//返回true 收到请求，停止通知
PrintWriter write= null;
PrintWriter write = null;
try {
write = response.getWriter();
} catch (IOException e) {
......@@ -482,17 +487,17 @@ public class PayApiController {
}
/**
* 支付宝支付的回调
*
* @param request
* @param response
*/
@RequestMapping("/aliPayCallback")
public void aliPayCallback(HttpServletRequest request, HttpServletResponse response) {
System.out.println("。。。。。。支付宝回调。。。。。");
logger.debug("支付宝回调开始了！");
Response responseRetrun = new Response();
Map map=request.getParameterMap();
Map map = request.getParameterMap();
printNotifyParam(map);
// Set keSet=map.entrySet();
// for(Iterator itr = keSet.iterator(); itr.hasNext();){
......@@ -518,25 +523,25 @@ public class PayApiController {
e.printStackTrace();
}
String orderId=request.getParameter("out_trade_no");
String orderId = request.getParameter("out_trade_no");
String code = request.getParameter("trade_status");
String total_amount = request.getParameter("total_amount");
String trade_no = request.getParameter("trade_no");
System.out.println("orderId:"+orderId);
logger.debug("支付宝回调orderId: {}", orderId);
OrderEntity orderEntity = new OrderEntity();
orderEntity.setTradeNo(trade_no);
orderEntity.setAmount(total_amount);
orderEntity.setPayCode(orderId);
try {
orderEntity = payService.aliPayNotifyPay(orderEntity,code);
orderEntity = payService.aliPayNotifyPay(orderEntity, code);
} catch (Exception e) {
e.printStackTrace();
}
//返回true 收到请求，停止通知
PrintWriter write= null;
PrintWriter write = null;
try {
write = response.getWriter();
} catch (IOException e) {
......@@ -551,36 +556,35 @@ public class PayApiController {
write.close();
}
/**
* 打印支付回调信息
*
* @param map
*/
private void printNotifyParam(Map map){
private void printNotifyParam(Map map) {
Set keSet = map.entrySet();
for(Iterator itr = keSet.iterator(); itr.hasNext();){
Map.Entry me=(Map.Entry)itr.next();
Object ok=me.getKey(); //获取参数名
Object ov=me.getValue(); //获取参数值
System.out.println(ok+"="+ok.toString());
System.out.println(ov+"="+ov.toString());
String[] value=new String[1];
if(ov instanceof String[]){
value=(String[])ov;
}else{
value[0]=ov.toString();
for (Iterator itr = keSet.iterator(); itr.hasNext(); ) {
Map.Entry me = (Map.Entry) itr.next();
Object ok = me.getKey(); //获取参数名
Object ov = me.getValue(); //获取参数值
String[] value = new String[1];
if (ov instanceof String[]) {
value = (String[]) ov;
} else {
value[0] = ov.toString();
}
for(int k=0;k <value.length;k++){
System.out.println(ok+"="+value[k]);
for (int k = 0; k < value.length; k++) {
logger.debug("参数名: {} , 参数值: {}",ok,value[k]);
}
}
}
/**
* 获取支付的结果
*
* @param orderEntity
* @return
*/
......@@ -593,14 +597,14 @@ public class PayApiController {
try {
// 获取订单
orderEntity = payService.getOrder(orderEntity);
if(orderEntity == null){
if (orderEntity == null) {
responseRetrun.setMessage(ComCode.STATUS_CODE_6001_DESC);
responseRetrun.setStatus(ComCode.STATUS_CODE_6001);
return responseRetrun;
}
// 已经支付成功或者支付失败的直接返回结果
if("2".equals(orderEntity.getPayStatus()) || "3".equals(orderEntity.getPayStatus()) || "4".equals(orderEntity.getPayStatus())){
if ("2".equals(orderEntity.getPayStatus()) || "3".equals(orderEntity.getPayStatus()) || "4".equals(orderEntity.getPayStatus())) {
responseRetrun.setMessage("ok");
responseRetrun.setStatus(ComCode.STATUS_CODE_2000);
responseRetrun.setData(orderEntity);
......@@ -627,22 +631,23 @@ public class PayApiController {
/**
* 获取支付通道
*
* @param dict
* @return
*/
@RequestMapping("/getDict")
public Response getDict(Dict dict){
public Response getDict(Dict dict) {
Response response = new Response();
if("pay_channel".equals(dict.getType())){
if ("pay_channel".equals(dict.getType())) {
List<DictPayChannel> list = dictService.findDictListPayChannel(dict);
for(DictPayChannel dictList:list){
for (DictPayChannel dictList : list) {
// 查询支持的银行
dictList.setBankList(userApiService.getBelongBankByPayChannel(dictList.getValue()));
}
response.setStatus(ComCode.STATUS_CODE_2000);
response.setData(list);
}else{
} else {
List<Dict> list = dictService.findDictList(dict);
response.setStatus(ComCode.STATUS_CODE_2000);
response.setData(list);
......@@ -653,6 +658,7 @@ public class PayApiController {
/**
* 获取可提现额度
*
* @param request
* @return
*/
......@@ -660,12 +666,18 @@ public class PayApiController {
public Response getPutForwardNum(JuHeZhongPayRequest request) {
Response resp = new Response();
try {
BalanceEntity balance = payService.getPutForwardNum(request);
BalanceEntity balance;
UserEntity userInfo = userApiService.getUserInfo(request);
if (userInfo.getLevel().equals("A") || userInfo.getLevel().equals("B")) {
balance = payService.getPutForwardNumHighLevel(request);
} else {
balance = payService.getPutForwardNum(request);
}
String balanceNum = balance.getBalance();
resp.setData(balanceNum);
resp.setMessage(ComCode.STATUS_CODE_2000_DESC);
resp.setStatus(ComCode.STATUS_CODE_2000);
}catch (Exception e){
} catch (Exception e) {
resp.setMessage(ComCode.STATUS_CODE_9998_DESC);
resp.setStatus(ComCode.STATUS_CODE_9998);
resp.setError(e.getMessage());
......@@ -676,11 +688,12 @@ public class PayApiController {
/**
* 测试分润
*
* @param request
* @return
*/
@PostMapping("/testBenefit")
public Response testBenefit(JuHeZhongPayRequest request){
public Response testBenefit(JuHeZhongPayRequest request) {
Response resp = new Response();
try {
// UserEntity userEntity, OrderEntity orderEntity, String code, JuHeZhongPayRequest request
......@@ -695,10 +708,10 @@ public class PayApiController {
String amount = df.format(Double.valueOf(request.getAmount()));
// 4. JuHeZhong支付
OrderEntity orderEntity = new OrderEntity(code, request.getSubMerchantCode(), payNo, payCode, "quick", request.getPayChannel(), "1", amount, request.getSubject(), "", "6", request.getCardCode());
payService.addUserBenefits(userInfo,orderEntity,orderEntity.getCode(),request);
payService.addUserBenefits(userInfo, orderEntity, orderEntity.getCode(), request);
resp.setMessage(ComCode.STATUS_CODE_2000_DESC);
resp.setStatus(ComCode.STATUS_CODE_2000);
}catch (Exception e){
} catch (Exception e) {
resp.setMessage(ComCode.STATUS_CODE_9998_DESC);
resp.setStatus(ComCode.STATUS_CODE_9998);
resp.setError(e.getMessage());
......
src/main/java/com/thinkgem/jeesite/modules/pay/service/BenefitSevice.java
......@@ -8,15 +8,12 @@ import com.thinkgem.jeesite.modules.pay.dao.OrderApiDao;
import com.thinkgem.jeesite.modules.pay.dao.PayApiDao;
import com.thinkgem.jeesite.modules.pay.entity.BalanceEntity;
import com.thinkgem.jeesite.modules.pay.entity.BenefitEntity;
import com.thinkgem.jeesite.modules.pay.entity.OrderEntity;
import com.thinkgem.jeesite.modules.sys.entity.Dict;
import com.thinkgem.jeesite.modules.sys.utils.DictUtils;
import com.thinkgem.jeesite.modules.user.bean.UserRequest;
import com.thinkgem.jeesite.modules.user.dao.UserApiDao;
import com.thinkgem.jeesite.modules.user.entity.UpgradeUserEntity;
import com.thinkgem.jeesite.modules.user.entity.UserEntity;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -44,10 +41,11 @@ public class BenefitSevice {
/**
* 余额
*
* @param entity
* @return
*/
public BalanceEntity getBalance(BenefitEntity entity){
public BalanceEntity getBalance(BenefitEntity entity) {
// 总收益
entity.setBenefitType("A");
......@@ -63,47 +61,47 @@ public class BenefitSevice {
// 今日收益
entity.setBenefitType("A");
Date date = new Date();
String today = DateUtils.formatDate(date,"yyyy-MM-dd HH:mm:ss");
String todayYMD = DateUtils.formatDate(date,"yyyy-MM-dd");
String today = DateUtils.formatDate(date, "yyyy-MM-dd HH:mm:ss");
String todayYMD = DateUtils.formatDate(date, "yyyy-MM-dd");
entity.setEndTime(today);
entity.setStartTime(todayYMD+ " 00:00:00");
entity.setStartTime(todayYMD + " 00:00:00");
BenefitEntity benefitEntityToday = payDao.getBenefitSum(entity);
if(benefitEntityToday != null && StringUtils.isNotBlank(benefitEntityToday.getAmount())){
if (benefitEntityToday != null && StringUtils.isNotBlank(benefitEntityToday.getAmount())) {
balanceEntity.setTodayIncome(benefitEntityToday.getAmount());
}else{
} else {
balanceEntity.setTodayIncome("0.00");
}
// 昨日收益
entity.setEndTime(DateUtils.getYesterday(todayYMD,"yyyy-MM-dd") + " 23:59:59");
entity.setStartTime(DateUtils.getYesterday(todayYMD,"yyyy-MM-dd") + " 00:00:00");
entity.setEndTime(DateUtils.getYesterday(todayYMD, "yyyy-MM-dd") + " 23:59:59");
entity.setStartTime(DateUtils.getYesterday(todayYMD, "yyyy-MM-dd") + " 00:00:00");
BenefitEntity benefitEntityYesterday = payDao.getBenefitSum(entity);
if(benefitEntityYesterday != null && StringUtils.isNotBlank(benefitEntityYesterday.getAmount())){
if (benefitEntityYesterday != null && StringUtils.isNotBlank(benefitEntityYesterday.getAmount())) {
balanceEntity.setYesterdayIncome(benefitEntityYesterday.getAmount());
}else{
} else {
balanceEntity.setYesterdayIncome("0.00");
}
// 本月收益
entity.setEndTime(today);
entity.setStartTime(DateUtils.getFirstByMonth(todayYMD,"yyyy-MM-dd") + " 00:00:00");
entity.setStartTime(DateUtils.getFirstByMonth(todayYMD, "yyyy-MM-dd") + " 00:00:00");
BenefitEntity benefitEntityMonth = payDao.getBenefitSum(entity);
if(benefitEntityMonth != null && StringUtils.isNotBlank(benefitEntityMonth.getAmount())){
if (benefitEntityMonth != null && StringUtils.isNotBlank(benefitEntityMonth.getAmount())) {
balanceEntity.setMonthIncome(benefitEntityMonth.getAmount());
}else{
} else {
balanceEntity.setMonthIncome("0.00");
}
// 本年收益
entity.setEndTime(today);
entity.setStartTime(DateUtils.getCurrYearFirst(todayYMD,"yyyy-MM-dd") + " 00:00:00");
entity.setStartTime(DateUtils.getCurrYearFirst(todayYMD, "yyyy-MM-dd") + " 00:00:00");
BenefitEntity benefitEntityYear = payDao.getBenefitSum(entity);
if(benefitEntityYear != null && StringUtils.isNotBlank(benefitEntityYear.getAmount())){
if (benefitEntityYear != null && StringUtils.isNotBlank(benefitEntityYear.getAmount())) {
balanceEntity.setYearIncome(benefitEntityYear.getAmount());
}else{
} else {
balanceEntity.setYearIncome("0.00");
}
......@@ -113,15 +111,16 @@ public class BenefitSevice {
/**
* 余额（高级别用户）
*
* @param entity
* @return
*/
public BalanceEntity getBalanceHighLevel(BenefitEntity entity , UserEntity userEntity){
public BalanceEntity getBalanceHighLevel(BenefitEntity entity, UserEntity userEntity) {
//高级用户是否存在推荐用户，存在继续，不存在，则直接返回
UserEntity recomUserEntity = checkRecommend(userEntity.getMobile());
UserEntity upgradeUserInfo = userDao.getUpgradeUserInfo(userEntity.getMobile());
if (recomUserEntity==null){
if (recomUserEntity == null) {
BalanceEntity balanceEntity = new BalanceEntity();
balanceEntity.setBalance("0.00");
balanceEntity.setTodayIncome("0.00");
......@@ -146,47 +145,47 @@ public class BenefitSevice {
// 今日收益
Date date = new Date();
String today = DateUtils.formatDate(date,"yyyy-MM-dd HH:mm:ss");
String todayYMD = DateUtils.formatDate(date,"yyyy-MM-dd");
String today = DateUtils.formatDate(date, "yyyy-MM-dd HH:mm:ss");
String todayYMD = DateUtils.formatDate(date, "yyyy-MM-dd");
entity.setEndTime(today);
entity.setStartTime(todayYMD+ " 00:00:00");
entity.setStartTime(todayYMD + " 00:00:00");
BenefitEntity benefitEntityToday = payDao.getBenefitSumHighLevel(entity);
if(benefitEntityToday != null && StringUtils.isNotBlank(benefitEntityToday.getAmount())){
if (benefitEntityToday != null && StringUtils.isNotBlank(benefitEntityToday.getAmount())) {
balanceEntity.setTodayIncome(benefitEntityToday.getAmount());
}else{
} else {
balanceEntity.setTodayIncome("0.00");
}
// 昨日收益
entity.setEndTime(DateUtils.getYesterday(todayYMD,"yyyy-MM-dd") + " 23:59:59");
entity.setStartTime(DateUtils.getYesterday(todayYMD,"yyyy-MM-dd") + " 00:00:00");
entity.setEndTime(DateUtils.getYesterday(todayYMD, "yyyy-MM-dd") + " 23:59:59");
entity.setStartTime(DateUtils.getYesterday(todayYMD, "yyyy-MM-dd") + " 00:00:00");
BenefitEntity benefitEntityYesterday = payDao.getBenefitSumHighLevel(entity);
if(benefitEntityYesterday != null && StringUtils.isNotBlank(benefitEntityYesterday.getAmount())){
if (benefitEntityYesterday != null && StringUtils.isNotBlank(benefitEntityYesterday.getAmount())) {
balanceEntity.setYesterdayIncome(benefitEntityYesterday.getAmount());
}else{
} else {
balanceEntity.setYesterdayIncome("0.00");
}
// 本月收益
entity.setEndTime(today);
entity.setStartTime(DateUtils.getFirstByMonth(todayYMD,"yyyy-MM-dd") + " 00:00:00");
entity.setStartTime(DateUtils.getFirstByMonth(todayYMD, "yyyy-MM-dd") + " 00:00:00");
BenefitEntity benefitEntityMonth = payDao.getBenefitSumHighLevel(entity);
if(benefitEntityMonth != null && StringUtils.isNotBlank(benefitEntityMonth.getAmount())){
if (benefitEntityMonth != null && StringUtils.isNotBlank(benefitEntityMonth.getAmount())) {
balanceEntity.setMonthIncome(benefitEntityMonth.getAmount());
}else{
} else {
balanceEntity.setMonthIncome("0.00");
}
// 本年收益
entity.setEndTime(today);
entity.setStartTime(DateUtils.getCurrYearFirst(todayYMD,"yyyy-MM-dd") + " 00:00:00");
entity.setStartTime(DateUtils.getCurrYearFirst(todayYMD, "yyyy-MM-dd") + " 00:00:00");
BenefitEntity benefitEntityYear = payDao.getBenefitSumHighLevel(entity);
if(benefitEntityYear != null && StringUtils.isNotBlank(benefitEntityYear.getAmount())){
if (benefitEntityYear != null && StringUtils.isNotBlank(benefitEntityYear.getAmount())) {
balanceEntity.setYearIncome(benefitEntityYear.getAmount());
}else{
} else {
balanceEntity.setYearIncome("0.00");
}
......@@ -195,24 +194,25 @@ public class BenefitSevice {
/**
* 分润
*
* @param request
* @return
*/
public List<BenefitEntity> getBenefitList(OrderRequest request){
if(request.getStartDate()!= null && request.getStartDate() != 0){
request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()),"yyyy-MM-dd") + " 00:00:00");
public List<BenefitEntity> getBenefitList(OrderRequest request) {
if (request.getStartDate() != null && request.getStartDate() != 0) {
request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()), "yyyy-MM-dd") + " 00:00:00");
}
if(request.getEndDate() != null && request.getEndDate() != 0){
request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()),"yyyy-MM-dd") + " 23:59:59");
if (request.getEndDate() != null && request.getEndDate() != 0) {
request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()), "yyyy-MM-dd") + " 23:59:59");
}
List<BenefitEntity> benefitList = null;
Request re = new Request();
re.setSubMerchantCode(request.getSubMerchantCode());
UserEntity userInfo = userDao.getUserInfo(re);
if (userInfo.getLevel().equals("A") || userInfo.getLevel().equals("B")){
if (userInfo.getLevel().equals("A") || userInfo.getLevel().equals("B")) {
//高级用户是否存在推荐用户，存在继续，不存在，则直接返回
UserEntity recomUserEntity = checkRecommend(userInfo.getMobile());
if (recomUserEntity==null){
if (recomUserEntity == null) {
return benefitList;
}
//升级前用户信息
......@@ -220,7 +220,7 @@ public class BenefitSevice {
request.setSubMerchantCode(upgradeUserInfo.getMobile());
request.setSign(getRateByLevel(userInfo.getLevel()));
benefitList = orderApiDao.getBenefitListHighLevel(request);
}else{
} else {
benefitList = orderApiDao.getBenefitList(request);
}
......@@ -230,15 +230,16 @@ public class BenefitSevice {
/**
* 分润 分页
*
* @param request
* @return
*/
public Page<BenefitEntity> getBenefitPage(OrderRequest request){
if(request.getStartDate()!= null && request.getStartDate() != 0){
request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()),"yyyy-MM-dd") + " 00:00:00");
public Page<BenefitEntity> getBenefitPage(OrderRequest request) {
if (request.getStartDate() != null && request.getStartDate() != 0) {
request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()), "yyyy-MM-dd") + " 00:00:00");
}
if(request.getEndDate() != null && request.getEndDate() != 0){
request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()),"yyyy-MM-dd") + " 23:59:59");
if (request.getEndDate() != null && request.getEndDate() != 0) {
request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()), "yyyy-MM-dd") + " 23:59:59");
}
Page<BenefitEntity> page = new Page<>();
page.setPageNo(request.getPageNum());
......@@ -254,10 +255,11 @@ public class BenefitSevice {
/**
* 可以提现的金额
*
* @param entity
* @return
*/
public BalanceEntity getBalanceM(BenefitEntity entity){
public BalanceEntity getBalanceM(BenefitEntity entity) {
// 总共可以提现的金额
......@@ -276,18 +278,18 @@ public class BenefitSevice {
}
public BalanceEntity getLastBalance(BenefitEntity benefitEntityA, BenefitEntity benefitEntityM){
public BalanceEntity getLastBalance(BenefitEntity benefitEntityA, BenefitEntity benefitEntityM) {
BalanceEntity balanceEntity = new BalanceEntity();
if(benefitEntityA==null){
if (benefitEntityA == null) {
balanceEntity.setBalance("0.00");
}else {
if(benefitEntityA.getAmount() == null){
} else {
if (benefitEntityA.getAmount() == null) {
benefitEntityA.setAmount("0.00");
}
if(benefitEntityM == null){
if (benefitEntityM == null) {
balanceEntity.setBalance(benefitEntityA.getAmount());
}else{
if(benefitEntityM.getAmount() == null ){
} else {
if (benefitEntityM.getAmount() == null) {
benefitEntityM.setAmount("0.00");
}
DecimalFormat df = new DecimalFormat("######0.00");
......@@ -299,23 +301,25 @@ public class BenefitSevice {
/**
* 判断高级用户是否已经推荐过用户
*
* @param mobile
* @return
*/
private UserEntity checkRecommend(String mobile){
public UserEntity checkRecommend(String mobile) {
UserEntity upgradeUserInfo = userDao.getUpgradeUserInfo(mobile);
UserRequest userRequest = new UserRequest();
userRequest.setRecommendedMobile(upgradeUserInfo.getMobile());
UserEntity recomUserEntity = userDao.checkRecommend(userRequest);
return recomUserEntity;
return recomUserEntity;
}
/**
* 根据高级别用户等级获取分润比例
*
* @param level
* @return
*/
private String getRateByLevel(String level){
public String getRateByLevel(String level) {
List<Dict> list = DictUtils.getDictList("benefit_rate_" + level);
String rate = "0";
if (list != null && list.size() > 0) {
......
src/main/java/com/thinkgem/jeesite/modules/pay/service/PayApiService.java
......@@ -759,7 +759,7 @@ public class PayApiService {
dto.put("timestamp", System.currentTimeMillis());
int amountInt = (int) (Double.valueOf(request.getAmount()) * 100);
//减去每笔手续费
int amount2 = amountInt- amountHL2;
int amount2 = amountInt - amountHL2;
dto.put("amount", amount2);
dto.put("idNo", userDetailEntity.getIdCard());
dto.put("accountName", userDetailEntity.getRealName());
......@@ -849,7 +849,7 @@ public class PayApiService {
//获取用户对应等级费率以及每笔需要的手续费
RateEntity gradeRate = getGradeRate(userEntity.getLevel(), request.getPayChannel());
logger.debug("用户等级请求结果，费率: {}, 单笔价格: {}",gradeRate.getRate(), gradeRate.getSiglePrice());
logger.debug("用户等级请求结果，费率: {}, 单笔价格: {}", gradeRate.getRate(), gradeRate.getSiglePrice());
//获取扣除手续费后的金额,已经转换为分
// BigDecimal amount = calculationAmount(gradeRate, request.getAmount());
// int amountFen = amount.multiply(BigDecimal.valueOf(100.0)).setScale(2, BigDecimal.ROUND_HALF_UP).intValue();
......@@ -890,7 +890,7 @@ public class PayApiService {
"cardNo: {}, settleBankName: {}, settleBankNo: {}, settleBankPhone:{}, " +
"name:{}, certificateCode:{}, userFee:{}", request.getExpireDate(), request.getCvn2(),
cardEntity.getCardMobile(), cardEntity.getCardNo(), cardEntityDebit.getBankName(), cardEntityDebit.getCardNo(),
cardEntityDebit.getCardMobile(), userDetail.getRealName(), userDetail.getIdCard(),amount);
cardEntityDebit.getCardMobile(), userDetail.getRealName(), userDetail.getIdCard(), amount);
JSONObject jsonObject = juHeZhongPayService.quickPay(dto);
logger.debug("HL4支付返回结果信息:{}" + jsonObject.toJSONString());
......@@ -983,7 +983,7 @@ public class PayApiService {
if (list != null && list.size() > 0) {
amount = list.get(0).getValue();
}
logger.debug("支付宝支付金额: {}",amount);
logger.debug("支付宝支付金额: {}", amount);
// 创建订单保存
if ("D".equals(request.getLevel())) {
request.setSubject("升级成白银会员");
......@@ -1350,6 +1350,37 @@ public class PayApiService {
return balanceEntity;
}
public BalanceEntity getPutForwardNumHighLevel(JuHeZhongPayRequest request) {
BalanceEntity balanceEntity = new BalanceEntity();
BenefitEntity entity = new BenefitEntity();
entity.setUserCode(request.getSubMerchantCode());
UserEntity userInfo = userService.getUserInfo(request);
//高级别用户
//是否已经有推荐的用户
UserEntity recomUserEntity = benefitSevice.checkRecommend(userInfo.getMobile());
//升级前用户
UserEntity upgradeUserInfo = userDao.getUpgradeUserInfo(userInfo.getMobile());
if (recomUserEntity == null) {
balanceEntity.setBalance("0.00");
return balanceEntity;
}
String levelRate = benefitSevice.getRateByLevel(userInfo.getLevel());
// 总收益
entity.setUserCode(request.getSubMerchantCode());
entity.setBenefitType(levelRate);
entity.setCreateDate(userInfo.getCreated());
entity.setCardCode(upgradeUserInfo.getMobile());
BenefitEntity benefitEntityA = payDao.getBenefitSumHighLevel(entity);
// 总提现
BenefitEntity benefitEntityM = payDao.getBenefitSumHighLevelM(entity);
// 余额 = 总收益-总提现
balanceEntity = benefitSevice.getLastBalance(benefitEntityA, benefitEntityM);
return balanceEntity;
}
private void orderFail(OrderEntity orderEntity) {
orderEntity.setPayStatus("4");
payDao.updateOrderStatus(orderEntity);
......@@ -1432,7 +1463,7 @@ public class PayApiService {
Double amountDouble = Double.valueOf(amount);
//总共所需手续费
int result = BigDecimal.valueOf(amountDouble * rate).add(BigDecimal.valueOf(siglePrice).subtract(BigDecimal.ONE)).multiply(BigDecimal.valueOf(100)).intValue();
logger.debug("计算出来的费率："+ result);
logger.debug("计算出来的费率：" + result);
//扣除费率及手续费后的金额
// BigDecimal result = BigDecimal.valueOf(amountDouble).subtract(BigDecimal.valueOf(siglePrice))
// .subtract(BigDecimal.valueOf(amountDouble * rate));
......@@ -1448,7 +1479,7 @@ public class PayApiService {
public int calculationAmountHL2(RateEntity gradeRate) {
Double siglePrice = Double.valueOf(gradeRate.getSiglePrice());
//总共所需手续费，只算每笔的手续费，单位是分
int result = BigDecimal.valueOf(siglePrice*100).intValue();
int result = BigDecimal.valueOf(siglePrice * 100).intValue();
return result;
}
}
src/main/java/com/thinkgem/jeesite/modules/pay/service/TimingService.java
package com.thinkgem.jeesite.modules.pay.service;
import com.alibaba.fastjson.JSONObject;
import com.thinkgem.jeesite.common.constant.ComCode;
import com.thinkgem.jeesite.modules.pay.dao.PayApiDao;
import com.thinkgem.jeesite.modules.pay.entity.BenefitEntity;
import com.thinkgem.jeesite.modules.pay.entity.OrderEntity;
import com.thinkgem.jeesite.modules.pay.juhezhong.dto.QuickDto;
import com.thinkgem.jeesite.modules.pay.juhezhong.service.JuHeZhongPayIntegralService;
import com.thinkgem.jeesite.modules.pay.juhezhong.service.JuHeZhongPayService;
import com.thinkgem.jeesite.modules.user.service.UserApiService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service
......@@ -26,12 +15,6 @@ public class TimingService {
private PayApiService payApiService;
@Autowired
private JuHeZhongPayService juHeZhongPayService;
@Autowired
private JuHeZhongPayIntegralService juHeZhongPayIntegralService;
@Autowired
private UserApiService userApiService;
......
src/main/java/com/thinkgem/jeesite/modules/user/api/UserApiController.java
......@@ -5,10 +5,7 @@ import com.thinkgem.jeesite.common.baseBean.Response;
import com.thinkgem.jeesite.common.constant.ComCode;
import com.thinkgem.jeesite.common.utils.StringUtils;
import com.thinkgem.jeesite.modules.commonError.MyException;
import com.thinkgem.jeesite.modules.img.bean.ImgRequest;
import com.thinkgem.jeesite.modules.pay.entity.BalanceEntity;
import com.thinkgem.jeesite.modules.pay.entity.RateEntity;
import com.thinkgem.jeesite.modules.sys.entity.User;
import com.thinkgem.jeesite.modules.user.bean.IdentityCodeRequest;
import com.thinkgem.jeesite.modules.user.bean.JuHeZhongPayRequest;
import com.thinkgem.jeesite.modules.user.bean.UserRequest;
......@@ -456,7 +453,6 @@ public class UserApiController {
|| StringUtils.isBlank(request.getCardBank())
) {
logger.debug("业务参数就异常了");
logger.debug(request.toString());
// || StringUtils.isBlank(request.getIdCardPlace())|| StringUtils.isBlank(request.getIdCardFront())|| StringUtils.isBlank(request.getIdCardBack())|| StringUtils.isBlank(request.getIdCardBack())
// || StringUtils.isBlank(request.getIdCardHold())|| StringUtils.isBlank(request.getDebitCard())|| StringUtils.isBlank(request.getCardSrc())|| StringUtils.isBlank(request.getCardPlace())
resp.setStatus(ComCode.STATUS_CODE_4001);
......
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