|
@@ -1,9 +1,11 @@
|
|
package pay.platform.api.system.controller;
|
|
package pay.platform.api.system.controller;
|
|
|
|
|
|
|
|
+import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.monitor4all.logRecord.annotation.OperationLog;
|
|
import cn.monitor4all.logRecord.annotation.OperationLog;
|
|
import cn.monitor4all.logRecord.context.LogRecordContext;
|
|
import cn.monitor4all.logRecord.context.LogRecordContext;
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
|
+import com.mybatisflex.core.query.QueryWrapper;
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
import io.swagger.v3.oas.annotations.Parameters;
|
|
import io.swagger.v3.oas.annotations.Parameters;
|
|
@@ -19,7 +21,9 @@ import pay.platform.api.system.model.vo.RestPasswdVO;
|
|
import pay.platform.api.system.servcie.PayMerchantService;
|
|
import pay.platform.api.system.servcie.PayMerchantService;
|
|
import pay.platform.core.common.Result;
|
|
import pay.platform.core.common.Result;
|
|
import pay.platform.core.common.domain.BasePage;
|
|
import pay.platform.core.common.domain.BasePage;
|
|
|
|
+import pay.platform.core.security.util.SecurityUtil;
|
|
import pay.platform.domain.PayMerchant;
|
|
import pay.platform.domain.PayMerchant;
|
|
|
|
+import pay.platform.domain.table.PayMerchantTableDef;
|
|
|
|
|
|
import java.io.Serializable;
|
|
import java.io.Serializable;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -97,8 +101,12 @@ public class PayMerchantController {
|
|
*/
|
|
*/
|
|
@GetMapping("/list")
|
|
@GetMapping("/list")
|
|
@Operation(summary = "查询所有商户")
|
|
@Operation(summary = "查询所有商户")
|
|
- public Result<List<PayMerchant>> list() {
|
|
|
|
- return Result.OK(PayMerchantService.list());
|
|
|
|
|
|
+ public Result<List<PayMerchantVO>> list() {
|
|
|
|
+ QueryWrapper queryWrapper = QueryWrapper.create().from(PayMerchantTableDef.PAY_MERCHANT).where(PayMerchantTableDef.PAY_MERCHANT.AGENT_ID.eq(SecurityUtil.getCurrentUser().getUserid()));
|
|
|
|
+ var list = PayMerchantService.list(queryWrapper);
|
|
|
|
+ List<PayMerchantVO> vos = BeanUtil.copyToList(list, PayMerchantVO.class);
|
|
|
|
+
|
|
|
|
+ return Result.OK(vos);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|