|
|
@@ -20,12 +20,11 @@ import beilv.usermembershipcard.service.IUserMembershipCardService;
|
|
|
import beilv.vipCard.domain.VipCard;
|
|
|
import beilv.vipCard.service.IVipCardService;
|
|
|
import beilv.vipCardAmountLog.domain.VipCardAmountLog;
|
|
|
-import beilv.vipCardAmountLog.service.IVipCardAmountLogService;
|
|
|
import beilv.vipCardLog.domain.VipCardLog;
|
|
|
import beilv.vipCardLog.service.IVipCardLogService;
|
|
|
+import beilv.wx.pay.controller.WxPayController;
|
|
|
+import beilv.wx.pay.domain.vo.AppRefundParam;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.slf4j.Logger;
|
|
|
-import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
@@ -34,8 +33,6 @@ import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
-import java.math.BigDecimal;
|
|
|
-import java.math.RoundingMode;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.ZoneId;
|
|
|
import java.time.temporal.ChronoUnit;
|
|
|
@@ -75,7 +72,7 @@ public class CardAppController extends BaseController {
|
|
|
private StringRedisTemplate redisTemplate;
|
|
|
|
|
|
@Autowired
|
|
|
- private IVipCardAmountLogService amountLogService;
|
|
|
+ private WxPayController payController;
|
|
|
|
|
|
/**
|
|
|
* 新增充值记录
|
|
|
@@ -158,7 +155,22 @@ public class CardAppController extends BaseController {
|
|
|
@PostMapping("/refund")
|
|
|
@ResponseBody
|
|
|
public AjaxResult refund(@RequestBody VipCardLog vipCardLog) {
|
|
|
- return AjaxResult.success(vipCardLogService.refundById(vipCardLog, true));
|
|
|
+ AjaxResult ajaxResult = vipCardLogService.refundById(vipCardLog, true);
|
|
|
+ if(ajaxResult.get("data")!= null){
|
|
|
+ VipCardLog data = (VipCardLog) ajaxResult.get("data");
|
|
|
+ AppRefundParam appRefundParam = new AppRefundParam();
|
|
|
+ appRefundParam.setOrderId(data.getId());
|
|
|
+ appRefundParam.setTotalPrice(data.getOriginalPrice());
|
|
|
+ appRefundParam.setRefundAmount(data.getRefundPrice());
|
|
|
+ appRefundParam.setUserId(Long.valueOf(data.getUserId()));
|
|
|
+ appRefundParam.setDescription(vipCardLog.getDescription());
|
|
|
+ try{
|
|
|
+ payController.refund(appRefundParam);
|
|
|
+ }catch (Exception e){
|
|
|
+ return AjaxResult.error("退款失败!");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return ajaxResult;
|
|
|
}
|
|
|
|
|
|
/**
|