Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/controller/admin/AdminWebsitController.java

@@ -95,4 +95,16 @@ public class AdminWebsitController {
         adminWebsitLogic.deletePayConfig(id, request);
         return ResponseHelper.success();
     }
+
+
+    @PostMapping("/pay/config/list")
+    @ApiOperation("网点支付配置列表")
+    public ResponseHelper<List<AdminWebsitPayConfig>> payConfigList(
+            @ApiParam(value = "网点编号") @RequestParam(required = false) String websitId,
+            @ApiParam(value = "类别 M=辅材 P=配件") @RequestParam(required = false) String type,
+            @ApiParam(value = "状态 true=开启 false=关闭") @RequestParam(required = false) Boolean status
+    ) {
+        List<AdminWebsitPayConfig> list = adminWebsitLogic.payConfigList(websitId, type, status);
+        return ResponseHelper.success(list);
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -413,4 +413,14 @@ public class AdminWebsitLogic {
     public void deletePayConfig(String id, HttpServletRequest request) {
         adminWebsitPayConfigService.removeById(id);
     }
+
+    public List<AdminWebsitPayConfig> payConfigList(String websitId, String type, Boolean status) {
+        final AdminUserCom adminUser = commonLogic.getAdminUser();
+        return adminWebsitPayConfigService.lambdaQuery()
+                .eq(Objects.nonNull(adminUser.getAdminCompanyWechat()), AdminWebsitPayConfig::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId())
+                .eq(StringUtils.isNotBlank(websitId), AdminWebsitPayConfig::getWebsitId, websitId)
+                .eq(StringUtils.isNotBlank(type), AdminWebsitPayConfig::getType, type)
+                .eq(Objects.nonNull(status), AdminWebsitPayConfig::getStatus, status)
+                .list();
+    }
 }