autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-13 03:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

申请退款dto

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-27 16:44:18 +08:00
parent 8cbaff5105
commit 36aa58bd6b
6 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
View File

@@ -18,7 +18,7 @@ import com.jsowell.pile.dto.WeixinPayDTO;
import com.jsowell.pile.vo.uniapp.PayModeVO; import com.jsowell.pile.vo.uniapp.PayModeVO;
import com.jsowell.service.MemberService; import com.jsowell.service.MemberService;
import com.jsowell.service.OrderService; import com.jsowell.service.OrderService;
import com.jsowell.pile.dto.WeChatRefundDTO; import com.jsowell.pile.dto.ApplyRefundDTO;
import com.jsowell.wxpay.response.WechatPayNotifyParameter; import com.jsowell.wxpay.response.WechatPayNotifyParameter;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@@ -239,7 +239,7 @@ public class PayController extends BaseController {
* https://api.jsowellcloud.com/uniapp/pay/refund * https://api.jsowellcloud.com/uniapp/pay/refund
*/ */
@PostMapping("/refund") @PostMapping("/refund")
public RestApiResponse<?> weChatRefund(HttpServletRequest request, @RequestBody WeChatRefundDTO dto) { public RestApiResponse<?> weChatRefund(HttpServletRequest request, @RequestBody ApplyRefundDTO dto) {
RestApiResponse<?> response; RestApiResponse<?> response;
try { try {
if (dto.getRefundAmount() == null) { if (dto.getRefundAmount() == null) {
@@ -269,7 +269,7 @@ public class PayController extends BaseController {
* https://api.jsowellcloud.com/uniapp/pay/adapayRefund * https://api.jsowellcloud.com/uniapp/pay/adapayRefund
*/ */
@PostMapping("/adapayRefund") @PostMapping("/adapayRefund")
public RestApiResponse<?> adapayRefund(HttpServletRequest request, @RequestBody WeChatRefundDTO dto) { public RestApiResponse<?> adapayRefund(HttpServletRequest request, @RequestBody ApplyRefundDTO dto) {
RestApiResponse<?> response; RestApiResponse<?> response;
try { try {
if (dto.getRefundAmount() == null) { if (dto.getRefundAmount() == null) {

6
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -40,7 +40,7 @@ import com.jsowell.pile.vo.web.OrderDetailInfoVO;
import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.pile.vo.web.PileStationVO;
import com.jsowell.pile.vo.web.PlatformTesterVO; import com.jsowell.pile.vo.web.PlatformTesterVO;
import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO; import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO;
import com.jsowell.pile.dto.WeChatRefundDTO; import com.jsowell.pile.dto.ApplyRefundDTO;
import com.jsowell.wxpay.response.WechatPayNotifyParameter; import com.jsowell.wxpay.response.WechatPayNotifyParameter;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -335,7 +335,7 @@ public class OrderService {
* 微信退款 * 微信退款
* @param dto * @param dto
*/ */
public void weChatRefund(WeChatRefundDTO dto) { public void weChatRefund(ApplyRefundDTO dto) {
log.info("微信退款接口 param:{}", JSONObject.toJSONString(dto)); log.info("微信退款接口 param:{}", JSONObject.toJSONString(dto));
orderBasicInfoService.weChatRefund(dto); orderBasicInfoService.weChatRefund(dto);
} }
@@ -344,7 +344,7 @@ public class OrderService {
* 汇付退款 * 汇付退款
* @param dto * @param dto
*/ */
public void adapayRefund(WeChatRefundDTO dto) { public void adapayRefund(ApplyRefundDTO dto) {
log.info("汇付退款 param:{}", JSON.toJSONString(dto)); log.info("汇付退款 param:{}", JSON.toJSONString(dto));
// 退款有两种情况 1-订单结算退款 2-用户余额退款 // 退款有两种情况 1-订单结算退款 2-用户余额退款
String refundType = dto.getRefundType(); String refundType = dto.getRefundType();

4
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -56,7 +56,7 @@ import com.jsowell.thirdparty.lianlian.util.Encodes;
import com.jsowell.thirdparty.lianlian.util.GBSignUtils; import com.jsowell.thirdparty.lianlian.util.GBSignUtils;
import com.jsowell.wxpay.common.WeChatPayParameter; import com.jsowell.wxpay.common.WeChatPayParameter;
import com.jsowell.wxpay.dto.AppletTemplateMessageSendDTO; import com.jsowell.wxpay.dto.AppletTemplateMessageSendDTO;
import com.jsowell.pile.dto.WeChatRefundDTO; import com.jsowell.pile.dto.ApplyRefundDTO;
import com.jsowell.wxpay.response.WechatPayRefundRequest; import com.jsowell.wxpay.response.WechatPayRefundRequest;
import com.jsowell.wxpay.service.WxAppletRemoteService; import com.jsowell.wxpay.service.WxAppletRemoteService;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
@@ -1102,7 +1102,7 @@ public class SpringBootTestController {
@Test @Test
public void testWeChatRefund() { public void testWeChatRefund() {
WeChatRefundDTO dto = new WeChatRefundDTO(); ApplyRefundDTO dto = new ApplyRefundDTO();
dto.setRefundType("2"); dto.setRefundType("2");
dto.setMemberId("82100864"); dto.setMemberId("82100864");
dto.setRefundAmount(new BigDecimal("1.23")); dto.setRefundAmount(new BigDecimal("1.23"));

5
jsowell-pile/src/main/java/com/jsowell/pile/dto/WeChatRefundDTO.java → jsowell-pile/src/main/java/com/jsowell/pile/dto/ApplyRefundDTO.java
View File

@@ -7,11 +7,14 @@ import lombok.NoArgsConstructor;
import java.math.BigDecimal; import java.math.BigDecimal;
/**
* 申请退款dto
*/
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@Builder @Builder
public class WeChatRefundDTO { public class ApplyRefundDTO {
/** /**
* 会员id * 会员id
*/ */

8
jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java
View File

@@ -17,7 +17,7 @@ import com.jsowell.pile.vo.uniapp.SendMessageVO;
import com.jsowell.pile.vo.web.IndexOrderInfoVO; import com.jsowell.pile.vo.web.IndexOrderInfoVO;
import com.jsowell.pile.vo.web.OrderListVO; import com.jsowell.pile.vo.web.OrderListVO;
import com.jsowell.pile.vo.web.OrderTotalDataVO; import com.jsowell.pile.vo.web.OrderTotalDataVO;
import com.jsowell.pile.dto.WeChatRefundDTO; import com.jsowell.pile.dto.ApplyRefundDTO;
import java.text.ParseException; import java.text.ParseException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -154,7 +154,7 @@ public interface IOrderBasicInfoService {
/** /**
* 结算订单退款和用户余额退款调这个方法 * 结算订单退款和用户余额退款调这个方法
*/ */
void weChatRefund(WeChatRefundDTO dto); void weChatRefund(ApplyRefundDTO dto);
/** /**
* 保存非法订单记录 * 保存非法订单记录
@@ -271,13 +271,13 @@ public interface IOrderBasicInfoService {
* 汇付支付 订单退款 * 汇付支付 订单退款
* @param dto * @param dto
*/ */
void refundForOrderWithAdapay(WeChatRefundDTO dto); void refundForOrderWithAdapay(ApplyRefundDTO dto);
/** /**
* 汇付支付 余额退款 * 汇付支付 余额退款
* @param dto * @param dto
*/ */
void refundForBalanceWithAdapay(WeChatRefundDTO dto); void refundForBalanceWithAdapay(ApplyRefundDTO dto);
/** /**
* 生成订单日报 * 生成订单日报

20
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -44,7 +44,7 @@ import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
import com.jsowell.pile.vo.uniapp.*; import com.jsowell.pile.vo.uniapp.*;
import com.jsowell.pile.vo.web.*; import com.jsowell.pile.vo.web.*;
import com.jsowell.wxpay.common.WeChatPayParameter; import com.jsowell.wxpay.common.WeChatPayParameter;
import com.jsowell.pile.dto.WeChatRefundDTO; import com.jsowell.pile.dto.ApplyRefundDTO;
import com.jsowell.wxpay.dto.WechatSendMsgDTO; import com.jsowell.wxpay.dto.WechatSendMsgDTO;
import com.jsowell.wxpay.response.WechatPayRefundRequest; import com.jsowell.wxpay.response.WechatPayRefundRequest;
import com.jsowell.wxpay.response.WechatPayRefundResponse; import com.jsowell.wxpay.response.WechatPayRefundResponse;
@@ -835,7 +835,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
memberBasicInfoService.updateMemberBalance(updateMemberBalanceDTO); memberBasicInfoService.updateMemberBalance(updateMemberBalanceDTO);
} else if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { // 微信支付 } else if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { // 微信支付
// 微信退款逻辑 // 微信退款逻辑
WeChatRefundDTO weChatRefundDTO = new WeChatRefundDTO(); ApplyRefundDTO weChatRefundDTO = new ApplyRefundDTO();
weChatRefundDTO.setOrderCode(orderCode); weChatRefundDTO.setOrderCode(orderCode);
weChatRefundDTO.setRefundType("1"); weChatRefundDTO.setRefundType("1");
weChatRefundDTO.setRefundAmount(residue); weChatRefundDTO.setRefundAmount(residue);
@@ -1011,7 +1011,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
} }
BigDecimal refundAmount = orderBasicInfo.getRefundAmount(); BigDecimal refundAmount = orderBasicInfo.getRefundAmount();
// 微信退款逻辑 // 微信退款逻辑
WeChatRefundDTO weChatRefundDTO = new WeChatRefundDTO(); ApplyRefundDTO weChatRefundDTO = new ApplyRefundDTO();
weChatRefundDTO.setOrderCode(orderBasicInfo.getOrderCode()); weChatRefundDTO.setOrderCode(orderBasicInfo.getOrderCode());
weChatRefundDTO.setRefundType("1"); weChatRefundDTO.setRefundType("1");
weChatRefundDTO.setRefundAmount(refundAmount); weChatRefundDTO.setRefundAmount(refundAmount);
@@ -1133,7 +1133,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
* @param dto * @param dto
*/ */
@Override @Override
public void weChatRefund(WeChatRefundDTO dto) { public void weChatRefund(ApplyRefundDTO dto) {
// 退款有两种情况 1-订单结算退款 2-用户余额退款 // 退款有两种情况 1-订单结算退款 2-用户余额退款
String refundType = dto.getRefundType(); String refundType = dto.getRefundType();
if (StringUtils.equals(refundType, "1")) { if (StringUtils.equals(refundType, "1")) {
@@ -1436,7 +1436,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
/** /**
* 订单退款处理逻辑 * 订单退款处理逻辑
*/ */
private WechatPayRefundResponse refundForOrder(WeChatRefundDTO dto) { private WechatPayRefundResponse refundForOrder(ApplyRefundDTO dto) {
// 查出来原来的支付信息 // 查出来原来的支付信息
WxpayCallbackRecord record = wxpayCallbackRecordService.selectByOrderCode(dto.getOrderCode()); WxpayCallbackRecord record = wxpayCallbackRecordService.selectByOrderCode(dto.getOrderCode());
if (Objects.isNull(record)) { if (Objects.isNull(record)) {
@@ -1478,7 +1478,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
* *
* @param dto * @param dto
*/ */
private WechatPayRefundResponse refundForBalance(WeChatRefundDTO dto) { private WechatPayRefundResponse refundForBalance(ApplyRefundDTO dto) {
// 查会员余额 // 查会员余额
MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId()); MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId());
if (memberVO == null) { if (memberVO == null) {
@@ -1963,7 +1963,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
} }
@Override @Override
public void refundForOrderWithAdapay(WeChatRefundDTO dto) { public void refundForOrderWithAdapay(ApplyRefundDTO dto) {
logger.info("汇付支付订单:{}, 执行退款逻辑 param:{}", dto.getOrderCode(), JSON.toJSONString(dto)); logger.info("汇付支付订单:{}, 执行退款逻辑 param:{}", dto.getOrderCode(), JSON.toJSONString(dto));
// 查出来原来的支付信息 // 查出来原来的支付信息
AdapayCallbackRecord record = adapayCallbackRecordService.selectByOrderCode(dto.getOrderCode()); AdapayCallbackRecord record = adapayCallbackRecordService.selectByOrderCode(dto.getOrderCode());
@@ -2016,7 +2016,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
} }
@Override @Override
public void refundForBalanceWithAdapay(WeChatRefundDTO dto) { public void refundForBalanceWithAdapay(ApplyRefundDTO dto) {
// 查会员余额 // 查会员余额
MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId()); MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId());
if (memberVO == null) { if (memberVO == null) {
@@ -2258,12 +2258,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
return; return;
} }
WeChatRefundDTO weChatRefundDTO = null; ApplyRefundDTO weChatRefundDTO = null;
for (RefundOrder refundOrder : list) { for (RefundOrder refundOrder : list) {
if (StringUtils.isBlank(refundOrder.getRefundAmount())) { if (StringUtils.isBlank(refundOrder.getRefundAmount())) {
continue; continue;
} }
weChatRefundDTO = new WeChatRefundDTO(); weChatRefundDTO = new ApplyRefundDTO();
weChatRefundDTO.setOrderCode(refundOrder.getOrderCode()); weChatRefundDTO.setOrderCode(refundOrder.getOrderCode());
weChatRefundDTO.setRefundAmount(new BigDecimal(refundOrder.getRefundAmount())); weChatRefundDTO.setRefundAmount(new BigDecimal(refundOrder.getRefundAmount()));
this.refundForOrderWithAdapay(weChatRefundDTO); this.refundForOrderWithAdapay(weChatRefundDTO);