Skip to content

S
SiEn
Commit ac81c85f by giaogiao
Options

完成捐款支付调用

parent 7475d6d9
Showing with 224 additions and 93 deletions
common/src/main/java/com/sien/common/controller/DonationRecordController.java
......@@ -36,7 +36,6 @@ public class DonationRecordController extends BaseController {
@Autowired
private DonationRecordService donationRecordService;
/**
* 添加捐款记录
*/
......
common/src/main/java/com/sien/common/controller/WxPayController.java
//package com.sien.common.controller;
//
//import com.github.binarywang.wxpay.bean.coupon.WxPayCouponInfoQueryRequest;
//import com.github.binarywang.wxpay.bean.coupon.WxPayCouponInfoQueryResult;
//import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendRequest;
//import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendResult;
//import com.github.binarywang.wxpay.bean.coupon.WxPayCouponStockQueryRequest;
//import com.github.binarywang.wxpay.bean.coupon.WxPayCouponStockQueryResult;
//import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
//import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
//import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
//import com.github.binarywang.wxpay.bean.notify.WxScanPayNotifyResult;
//import com.github.binarywang.wxpay.bean.request.*;
//import com.github.binarywang.wxpay.bean.result.*;
//import com.github.binarywang.wxpay.exception.WxPayException;
//import com.github.binarywang.wxpay.service.WxPayService;
//import io.swagger.annotations.ApiOperation;
//import lombok.AllArgsConstructor;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.GetMapping;
//import org.springframework.web.bind.annotation.PathVariable;
//import org.springframework.web.bind.annotation.PostMapping;
//import org.springframework.web.bind.annotation.RequestBody;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RequestParam;
//import org.springframework.web.bind.annotation.RestController;
//
//import java.io.File;
//import java.util.Date;
//
//
///**
// * @author Binary Wang
// */
////@Api(value = "微信支付", hidden = true)
//@RestController
//@RequestMapping("/pay")
//@AllArgsConstructor
//public class WxPayController {
//
// @Autowired
// private WxPayService wxService;
package com.sien.common.controller;
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.binarywang.wxpay.service.WxPayService;
import com.sien.common.service.DonationRecordService;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author Binary Wang
*/
//@Api(value = "微信支付", hidden = true)
@RestController
@RequestMapping("/pay")
@AllArgsConstructor
public class WxPayController {
@Autowired
private WxPayService wxService;
@Autowired
private DonationRecordService donationRecordService;
@ApiOperation(value = "捐款支付回调通知处理")
@PostMapping("/notify/donationOrder")
public String parseDonationOrderNotifyResult(@RequestBody String xmlData) throws WxPayException {
return donationRecordService.parseDonationOrderNotifyResult(xmlData);
}
@ApiOperation(value = "会员充值支付回调通知处理")
@PostMapping("/notify/vipOrder")
public String parseVipOrderNotifyResult(@RequestBody String xmlData) throws WxPayException {
final WxPayOrderNotifyResult notifyResult = this.wxService.parseOrderNotifyResult(xmlData);
// TODO 根据自己业务场景需要构造返回对象
return WxPayNotifyResponse.success("成功");
}
//
// /**
// * <pre>
......@@ -395,6 +399,6 @@
// public String queryComment(Date beginDate, Date endDate, Integer offset, Integer limit) throws WxPayException {
// return this.wxService.queryComment(beginDate, endDate, offset, limit);
// }
//
//}
//
}
common/src/main/java/com/sien/common/entity/DonationRecord.java
......@@ -57,4 +57,14 @@ public class DonationRecord extends BaseEntity {
@ApiModelProperty("是否为别人替我捐款")
private Integer isReplace;
@ApiModelProperty("微信商家订单id")
private String wxMerPayId;
@ApiModelProperty("支付状态,1已支付, 0未支付")
private Integer payStatus;
@ApiModelProperty("支付时间")
private Date payTime;
}
common/src/main/java/com/sien/common/entity/VipRecord.java
......@@ -64,4 +64,13 @@ public class VipRecord extends BaseEntity {
@ApiModelProperty("修改时间")
private Date updateTime;
@ApiModelProperty("微信商家订单id")
private String wxMerPayId;
@ApiModelProperty("支付状态,1已支付, 0未支付")
private Integer payStatus;
@ApiModelProperty("支付时间")
private Date payTime;
}
common/src/main/java/com/sien/common/mapper/DonationRecordMapper.java
......@@ -36,7 +36,7 @@ public interface DonationRecordMapper extends BaseMapper<DonationRecord> {
* @param donationRecordPageParam
* @return
*/
IPage<DonationRecordQueryVo> getDonationRecordPageList(@Param("page") Page page, @Param("param") DonationRecordPageParam donationRecordPageParam);
IPage<DonationRecordQueryVo> getDonationRecordPageList(@Param("page") Page page, @Param("param") DonationRecordPageParam donationRecordPageParam, @Param("userId") Long userId);
/**
......
common/src/main/java/com/sien/common/param/DonationRecordPageParam.java
package com.sien.common.param;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
/**
* <pre>
......@@ -18,6 +18,6 @@ import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "捐款记录分页参数")
public class DonationRecordPageParam extends BasePageOrderParam{
private static final long serialVersionUID=1L;
}
public class DonationRecordPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
}
common/src/main/java/com/sien/common/param/VipRecordOpenParam.java
......@@ -30,7 +30,7 @@ public class VipRecordOpenParam extends BasePageOrderParam {
private BigDecimal money;
@NotNull(message = "开通多久不能为空")
@ApiModelProperty("开通多久")
@ApiModelProperty("开通多少年")
private Integer years;
@NotBlank(message = "会员等级不能为空")
......@@ -38,11 +38,17 @@ public class VipRecordOpenParam extends BasePageOrderParam {
private String vipLevel;
@NotBlank(message = "不能为空")
@ApiModelProperty("是否代替他人捐款")
private Boolean isAgent;
@ApiModelProperty("是否代替他人开通")
private Boolean isReplace;
@NotBlank(message = "不能为空")
@ApiModelProperty("替他人捐款,接收人userId, 当isAgent=1为必填")
private Long agentUserId;
// @NotBlank(message = "不能为空")
// @ApiModelProperty("替他人开通,接收人userId, ")
// private Long agentUserId;
@ApiModelProperty("捐款接收用户手机号,当isAgent=1为必填")
private String userPhone;
@ApiModelProperty("手机区号,当isAgent=1为必填")
private String phoneArea;
}
common/src/main/java/com/sien/common/param/app/DonationRecordAdd.java
......@@ -16,18 +16,21 @@ import java.math.BigDecimal;
public class DonationRecordAdd implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("捐款金额")
@ApiModelProperty(value = "捐款金额", required = true)
private BigDecimal money;
@ApiModelProperty("捐款用途;直接录入字符串: 助学助教,资助病残;慰问孤老,其他")
@ApiModelProperty(value = "捐款用途;直接录入字符串: 助学助教,资助病残;慰问孤老,其他", required = true)
private String purpose;
@ApiModelProperty("捐款方式;1正常,2匿名")
@ApiModelProperty(value = "捐款方式;1正常,2匿名", required = true)
private Integer way;
@ApiModelProperty("是否替别人捐款")
@ApiModelProperty(value = "是否替别人捐款,1是,0不是", required = true)
private Integer isReplace;
@ApiModelProperty("捐款接收用户手机号")
@ApiModelProperty("捐款接收用户手机号,isReplace=1时必传")
private String userPhone;
@ApiModelProperty("手机区号,isReplace=1时必传")
private String phoneArea;
}
common/src/main/java/com/sien/common/service/DonationRecordService.java
......@@ -37,6 +37,10 @@ public interface DonationRecordService extends BaseService<DonationRecord> {
boolean saveDonationRecord(DonationRecord donationRecord) throws Exception;
// 回调
String parseDonationOrderNotifyResult(String xmlData);
ApiResult<WxPayMpOrderResult> add(DonationRecordAdd donationRecordAdd) throws Exception;
/**
......
common/src/main/java/com/sien/common/service/impl/DonationRecordServiceImpl.java
package com.sien.common.service.impl;
import cn.hutool.captcha.generator.RandomGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.binarywang.wxpay.service.WxPayService;
import com.sien.common.entity.AppUser;
import com.sien.common.entity.DonationAgent;
import com.sien.common.entity.DonationRecord;
import com.sien.common.mapper.DonationRecordMapper;
import com.sien.common.param.DonationRecordPageParam;
import com.sien.common.param.app.DonationRecordAdd;
import com.sien.common.service.AppUserService;
import com.sien.common.service.DonationAgentService;
import com.sien.common.service.DonationRecordService;
import com.sien.common.vo.AppUserQueryVo;
import com.sien.common.vo.DonationRankAndTotal;
import com.sien.common.vo.DonationRecordQueryVo;
import io.geekidea.springbootplus.framework.common.api.ApiCode;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
......@@ -27,7 +35,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.Date;
/**
* 捐款记录 服务实现类
......@@ -39,9 +50,9 @@ import javax.servlet.http.HttpServletRequest;
@Service
public class DonationRecordServiceImpl extends BaseServiceImpl<DonationRecordMapper, DonationRecord> implements DonationRecordService {
private static final String BODY = "四恩慈善会-捐款";
private static final String BODY = "厦门市四恩慈善会捐款";
private static final String http = "http";
private static final String NOTIFY_URL = "https://c7a30ed052d8.ngrok.io/api/pay/notify/donationOrder";
@Autowired
private DonationRecordMapper donationRecordMapper;
......@@ -49,12 +60,15 @@ public class DonationRecordServiceImpl extends BaseServiceImpl<DonationRecordMap
@Autowired
private WxPayService wxService;
@Autowired
HttpServletRequest req;
@Resource
HttpServletRequest httpServletRequest;
@Autowired
private AppUserService appUserService;
@Autowired
private DonationAgentService donationAgentService;
@Override
public DonationRankAndTotal getDonationRankAndTotal(Long userId) {
return donationRecordMapper.getDonationRankAndTotal(userId);
......@@ -66,41 +80,115 @@ public class DonationRecordServiceImpl extends BaseServiceImpl<DonationRecordMap
return super.save(donationRecord);
}
@Override
public String parseDonationOrderNotifyResult(String xmlData) {
WxPayOrderNotifyResult notifyResult;
try {
notifyResult = this.wxService.parseOrderNotifyResult(xmlData);
} catch (WxPayException e) {
// 是否能解密成功
e.printStackTrace();
return WxPayNotifyResponse.fail("错误");
}
DonationRecord donationRecord = super.getOne(new QueryWrapper<DonationRecord>().lambda().eq(DonationRecord::getWxMerPayId, notifyResult.getOutTradeNo()));
// 如果已经支付 直接响应成功
if (donationRecord.getPayStatus() == 1) {
return WxPayNotifyResponse.successResp("成功");
}
donationRecord.setPayStatus(1);
donationRecord.setPayTime(new Date());
super.updateById(donationRecord);
return WxPayNotifyResponse.successResp("成功");
// 根据自己业务场景需要构造返回对象
// return WxPayNotifyResponse.success("成功");
}
@Override
public ApiResult<WxPayMpOrderResult> add(DonationRecordAdd donationRecordAdd) throws Exception {
public ApiResult<WxPayMpOrderResult> add(DonationRecordAdd donationRecordAdd) {
JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
AppUserQueryVo appUserById = appUserService.getAppUserById(jwtToken.getUserId());
AppUserQueryVo appUserById = null;
try {
appUserById = appUserService.getAppUserById(jwtToken.getUserId());
} catch (Exception e) {
e.printStackTrace();
return ApiResult.fail(ApiCode.FAIL, new WxPayMpOrderResult());
}
// 用户判空
if (appUserById == null) {
return ApiResult.fail(ApiCode.FAIL, new WxPayMpOrderResult());
}
// 微信支付请求参数对象
WxPayUnifiedOrderRequest wxPayUnifiedOrderRequest = new WxPayUnifiedOrderRequest();
String openid = appUserById.getWechatOpenId();
String spbillCreateIp = req.getRemoteAddr();
int totalFee = donationRecordAdd.getMoney().intValue() * 100;
String spbillCreateIp = httpServletRequest.getRemoteAddr();
BigDecimal num2 = new BigDecimal(100);
int totalFee = donationRecordAdd.getMoney().multiply(num2).intValue();
DonationRecord donationRecord = new DonationRecord();
// donationRecord.setId(0L);
donationRecord.setFkUserId(jwtToken.getUserId());
// 捐款接收人, 如果为别人捐款
if (donationRecordAdd.getIsReplace() == 1) {
AppUser user = appUserService.getOne(new QueryWrapper<AppUser>().lambda()
.eq(AppUser::getPhone, donationRecordAdd.getUserPhone())
.eq(AppUser::getPhoneArea, donationRecordAdd.getPhoneArea()));
//判断接收方是否存在
if (user == null) {
return ApiResult.fail(ApiCode.FAIL, new WxPayMpOrderResult());
}
donationRecord.setFkUserId(user.getId());
} else {
donationRecord.setFkUserId(jwtToken.getUserId());
}
// 设置捐款记录表
donationRecord.setMoney(donationRecordAdd.getMoney());
donationRecord.setPurpose(donationRecordAdd.getPurpose());
donationRecord.setWay(donationRecordAdd.getWay());
// donationRecord.setRemark("");
// donationRecord.setCreateTime(new Date());
// donationRecord.setUpdateTime(new Date());
donationRecord.setIsReplace(donationRecordAdd.getIsReplace());
String outTradeNo = new RandomGenerator(32).generate();
donationRecord.setWxMerPayId(outTradeNo);
WxPayMpOrderResult order = getWxPayMpOrderResult(wxPayUnifiedOrderRequest, BODY, openid, spbillCreateIp, totalFee, http);
// 保存至数据库
super.save(donationRecord);
// 为代理捐款 则保存代理记录
if (donationRecordAdd.getIsReplace() == 1) {
DonationAgent donationAgent = new DonationAgent();
donationAgent.setFkUserId(jwtToken.getUserId());
donationAgent.setFkRecordId(donationRecord.getId());
donationAgentService.save(donationAgent);
}
// 调用微信支付api
WxPayMpOrderResult order = null;
try {
order = getWxPayMpOrderResult(wxPayUnifiedOrderRequest, outTradeNo, openid, spbillCreateIp, totalFee);
} catch (WxPayException e) {
e.printStackTrace();
}
return ApiResult.ok(order);
}
private WxPayMpOrderResult getWxPayMpOrderResult(WxPayUnifiedOrderRequest wxPayUnifiedOrderRequest, String body, String openid, String spbillCreateIp, int totalFee, String http) {
wxPayUnifiedOrderRequest.setBody(body);
private WxPayMpOrderResult getWxPayMpOrderResult(WxPayUnifiedOrderRequest wxPayUnifiedOrderRequest, String outTradeNo, String openid, String spbillCreateIp, int totalFee) throws WxPayException {
wxPayUnifiedOrderRequest.setBody(DonationRecordServiceImpl.BODY);
// 商户系统内部的订单号,32个字符内、可包含字母, 其他说明见商户订单号
wxPayUnifiedOrderRequest.setOutTradeNo(new RandomGenerator(32).generate());
wxPayUnifiedOrderRequest.setOutTradeNo(outTradeNo);
//订单总金额，单位为分，详见支付金额
wxPayUnifiedOrderRequest.setTotalFee(totalFee);
......@@ -109,18 +197,18 @@ public class DonationRecordServiceImpl extends BaseServiceImpl<DonationRecordMap
wxPayUnifiedOrderRequest.setSpbillCreateIp(spbillCreateIp);
// 接收微信支付异步通知回调地址，通知url必须为直接可访问的url，不能携带参数。
wxPayUnifiedOrderRequest.setNotifyUrl(http);
wxPayUnifiedOrderRequest.setNotifyUrl(DonationRecordServiceImpl.NOTIFY_URL);
wxPayUnifiedOrderRequest.setOpenid(openid);
String jsapi = "JSAPI";
wxPayUnifiedOrderRequest.setTradeType(jsapi);
WxPayMpOrderResult order = null;
try {
order = this.wxService.createOrder(wxPayUnifiedOrderRequest);
} catch (WxPayException e) {
e.printStackTrace();
}
// try {
order = this.wxService.createOrder(wxPayUnifiedOrderRequest);
// } catch (WxPayException e) {
// e.printStackTrace();
// }
return order;
}
......@@ -143,8 +231,11 @@ public class DonationRecordServiceImpl extends BaseServiceImpl<DonationRecordMap
@Override
public Paging<DonationRecordQueryVo> getDonationRecordPageList(DonationRecordPageParam donationRecordPageParam) throws Exception {
JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
Page<DonationRecordQueryVo> page = new PageInfo<>(donationRecordPageParam, OrderItem.desc(getLambdaColumn(DonationRecord::getCreateTime)));
IPage<DonationRecordQueryVo> iPage = donationRecordMapper.getDonationRecordPageList(page, donationRecordPageParam);
IPage<DonationRecordQueryVo> iPage = donationRecordMapper.getDonationRecordPageList(page, donationRecordPageParam, jwtToken.getUserId());
return new Paging<DonationRecordQueryVo>(iPage);
}
......
common/src/main/java/com/sien/common/service/impl/VipRecordServiceImpl.java
......@@ -60,8 +60,8 @@ public class VipRecordServiceImpl extends BaseServiceImpl<VipRecordMapper, VipRe
// vipRecord.setUpdateTime(new Date());
// 判断是否为替他人
if (vipRecordOpenParam.getIsAgent()) {
vipRecord.setFkRechargeUser(vipRecordOpenParam.getAgentUserId());
if (vipRecordOpenParam.getIsReplace()) {
// vipRecord.setFkRechargeUser(vipRecordOpenParam.getAgentUserId());
}
return super.save(vipRecord);
......
common/src/main/resources/mapper/DonationRecordMapper.xml
......@@ -5,8 +5,8 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id
, fk_user_id, money, purpose, way, remark, create_time, update_time, is_replace
</sql>
, fk_user_id, money, purpose, way, remark, create_time, update_time, is_replace,wx_mer_pay_id,pay_status,pay_time
</sql>
<select id="getDonationRecordById" resultType="com.sien.common.vo.DonationRecordQueryVo">
select
......@@ -19,13 +19,15 @@
select
<include refid="Base_Column_List"/>
from donation_record
where pay_status=1
and fk_user_id=#{userId}
</select>
<select id="getDonationRankAndTotal" resultType="com.sien.common.vo.DonationRankAndTotal">
SELECT
tb.*,
@curRank := @curRank + 1 AS rank
FROM
( SELECT fk_user_id, sum( money ) AS drTotal FROM donation_record GROUP BY fk_user_id ORDER BY drTotal DESC ) AS tb,
( SELECT fk_user_id, sum( money ) AS drTotal FROM donation_record WHERE donation_record.pay_status = 1 GROUP BY fk_user_id ORDER BY drTotal DESC ) AS tb,
( SELECT @curRank := 0 ) r
WHERE
fk_user_id = #{userId}
......
common/src/main/resources/mapper/VipRecordMapper.xml
......@@ -4,8 +4,8 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, fk_user_id, fk_recharge_user, money, expired_at, years, vip_level, remark, create_time, update_time
</sql>
id, fk_user_id, fk_recharge_user, money, expired_at, years, vip_level, remark, create_time, update_time,wx_mer_pay_id,pay_status,pay_time
</sql>
<select id="getVipRecordById" resultType="com.sien.common.vo.VipRecordQueryVo">
select
......
config/src/main/resources/config/application.yml
......@@ -195,6 +195,9 @@ spring-boot-plus:
# - /actuator/**
- # 排除首页
- /,/index.html
# 微信支付回调
- /pay/notify/donationOrder
- /pay/notify/vipOrder
# 多行字符串权限配置
......
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