|
@@ -291,7 +291,7 @@ public class CardAppController extends BaseController {
|
|
|
appRefundParam.setDescription(vipCardLog.getDescription());
|
|
appRefundParam.setDescription(vipCardLog.getDescription());
|
|
|
try {
|
|
try {
|
|
|
// 2. 执行微信退款
|
|
// 2. 执行微信退款
|
|
|
- payController.refund(appRefundParam);
|
|
|
|
|
|
|
+// payController.refund(appRefundParam);
|
|
|
// 3. 微信退款成功后,更新订单状态和账户信息
|
|
// 3. 微信退款成功后,更新订单状态和账户信息
|
|
|
return vipCardLogService.refundById(vipCardLog, false, true);
|
|
return vipCardLogService.refundById(vipCardLog, false, true);
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -336,6 +336,7 @@ public class CardAppController extends BaseController {
|
|
|
@GetMapping("/getUserCardList")
|
|
@GetMapping("/getUserCardList")
|
|
|
public AjaxResult getUserCardList(UserMembershipCard userMembershipCard) {
|
|
public AjaxResult getUserCardList(UserMembershipCard userMembershipCard) {
|
|
|
startPage();
|
|
startPage();
|
|
|
|
|
+ userMembershipCard.setState("hasClubCard");
|
|
|
List<UserMembershipCard> list = userMembershipCardService.selectUserMembershipCardList(userMembershipCard);
|
|
List<UserMembershipCard> list = userMembershipCardService.selectUserMembershipCardList(userMembershipCard);
|
|
|
return AjaxResult.success(getDataTable(list).getRows());
|
|
return AjaxResult.success(getDataTable(list).getRows());
|
|
|
}
|
|
}
|