|
@@ -1,8 +1,11 @@
|
|
|
package com.sqx.modules.pay.controller.app;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.sqx.common.utils.Result;
|
|
|
import com.sqx.modules.app.annotation.Login;
|
|
|
import com.sqx.modules.pay.dao.PayDetailsDao;
|
|
|
+import com.sqx.modules.pay.entity.PayDetails;
|
|
|
+import com.sqx.modules.pay.service.PayDetailsService;
|
|
|
import com.sqx.modules.pay.service.WxRiderService;
|
|
|
import com.sqx.modules.pay.service.WxService;
|
|
|
import io.swagger.annotations.Api;
|
|
@@ -17,6 +20,7 @@ import java.io.IOException;
|
|
|
import java.io.InputStream;
|
|
|
import java.io.InputStreamReader;
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.util.List;
|
|
|
|
|
|
/**
|
|
|
* @author fang
|
|
@@ -34,6 +38,8 @@ public class ApiWeiXinPayController {
|
|
|
private WxRiderService wxRiderService;
|
|
|
@Autowired
|
|
|
private PayDetailsDao payDetailsDao;
|
|
|
+ @Autowired
|
|
|
+ private PayDetailsService payDetailsService;
|
|
|
|
|
|
@Login
|
|
|
@ApiOperation("微信app充值")
|
|
@@ -54,6 +60,14 @@ public class ApiWeiXinPayController {
|
|
|
return wxService.payMoney(userId,money,3, rechargeId);
|
|
|
}
|
|
|
|
|
|
+ @Login
|
|
|
+ @ApiOperation("微信小程序充值记录")
|
|
|
+ @GetMapping("/wxPayJsApiMoneyDetails")
|
|
|
+ public Result wxPayJsApiMoneyDetails(int page, int limit,int classify, @RequestAttribute("userId") Long userId){
|
|
|
+ List<PayDetails> list = payDetailsService.list(new QueryWrapper<PayDetails>().eq("user_id", userId).eq("state", 1).eq("type", 1));
|
|
|
+ return Result.success().put("data",payDetailsService.wxPayJsApiMoneyDetails(page,limit,classify,userId));
|
|
|
+ }
|
|
|
+
|
|
|
@Login
|
|
|
@ApiOperation("微信支付订单")
|
|
|
@PostMapping("/payOrders")
|