From 68e340a3d412b71de1ef7664c315931f2fc94632 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 22 Aug 2023 10:51:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=97=A5=E6=8A=A5=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SettleOrderReportServiceImpl.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index 3b6a483e4..2e2139b01 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -6,7 +6,6 @@ import com.google.common.collect.Lists; import com.jsowell.adapay.dto.QueryPaymentConfirmDTO; import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse; import com.jsowell.adapay.service.AdapayService; -import com.jsowell.common.constant.Constants; import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.PageUtils; @@ -113,12 +112,24 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(build); List paymentConfirms = response.getPaymentConfirms(); // 如果没有分账信息，说明没有清分 - vo.setClearingStatus(CollectionUtils.isEmpty(paymentConfirms) ? Constants.ZERO : Constants.ONE); - if (Constants.ONE.equals(vo.getClearingStatus())) { + String clearingStatus = null; + if (CollectionUtils.isEmpty(paymentConfirms)) { + clearingStatus = "未清分"; + } else { + clearingStatus = "已清分"; + } + vo.setClearingStatus(clearingStatus); + if ("已清分".equals(vo.getClearingStatus())) { ClearingBillVO clearingBillVO = clearingWithdrawInfoService.selectWithdrawInfoByOrderCode(orderCode); vo.setClearingBillCode(clearingBillVO.getClearingBillCode()); vo.setWithdrawCode(clearingBillVO.getWithdrawCode()); - vo.setWithdrawStatus(clearingBillVO.getWithdrawStatus()); + String withdrawStatus = null; + if (StringUtils.equals(clearingBillVO.getWithdrawStatus(), "0")) { + withdrawStatus = "处理中"; + } else { + withdrawStatus = "已提现"; + } + vo.setWithdrawStatus(withdrawStatus); } resultList.add(vo); } From bb5400768f010c6f20dfbbc6a2a7d18254295b13 Mon Sep 17 00:00:00 2001 From: admin-lmm <2497833386@QQ.com> Date: Tue, 22 Aug 2023 11:01:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-ui/src/views/pile/merchant/components/revenue.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jsowell-ui/src/views/pile/merchant/components/revenue.vue b/jsowell-ui/src/views/pile/merchant/components/revenue.vue index 5bd82d5f3..3961fa6ed 100644 --- a/jsowell-ui/src/views/pile/merchant/components/revenue.vue +++ b/jsowell-ui/src/views/pile/merchant/components/revenue.vue @@ -97,7 +97,6 @@ - @@ -139,7 +138,7 @@ export default { props: ["merchantId"], data() { return { - orderTotal: 1, + orderTotal: 0, getOrderParams: { pageNum: 1, pageSize: 10, From 83d52dd6e988bac29bbca9a4a630afce285082cb Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 22 Aug 2023 11:08:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?update=20=E9=80=BB=E8=BE=91=E6=8F=90?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/common/core/controller/BaseController.java | 10 ++++++++++ .../java/com/jsowell/adapay/service/AdapayService.java | 1 + 2 files changed, 11 insertions(+) diff --git a/jsowell-common/src/main/java/com/jsowell/common/core/controller/BaseController.java b/jsowell-common/src/main/java/com/jsowell/common/core/controller/BaseController.java index 427a84b23..c157e8304 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/core/controller/BaseController.java +++ b/jsowell-common/src/main/java/com/jsowell/common/core/controller/BaseController.java @@ -6,6 +6,7 @@ import com.jsowell.common.constant.HttpStatus; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.core.domain.model.LoginUser; import com.jsowell.common.core.page.PageDomain; +import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.core.page.TableSupport; import com.jsowell.common.enums.ykc.ReturnCodeEnum; @@ -86,6 +87,15 @@ public class BaseController { return rspData; } + protected TableDataInfo getDataTable(PageResponse pageResponse) { + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + rspData.setRows(pageResponse.getList()); + rspData.setTotal(pageResponse.getTotal()); + return rspData; + } + /** * 返回成功 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index 2b1e8d2d3..d12053d8b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -694,6 +694,7 @@ public class AdapayService { settleCountParams.put("member_id", adapayAccountBalanceVO.getAdapayMemberId()); settleCountParams.put("app_id", config.getAdapayAppId()); settleCountParams.put("settle_account_id", adapayAccountBalanceVO.getSettleAccountId()); + settleCountParams.put("cash_type", "T1"); settleCountParams.put("notify_url", ADAPAY_CALLBACK_URL); Map settleCount = Drawcash.create(settleCountParams, config.getWechatAppId()); log.info("申请取现接口，请求参数:{}, 返回参数:{}", JSON.toJSONString(settleCountParams), JSON.toJSONString(settleCount)); From ee3d1b20c408ddaf5a9c5e1f6be09010f7abae5f Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 22 Aug 2023 11:11:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?update=20=E9=80=BB=E8=BE=91=E6=8F=90?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsowell/adapay/service/AdapayService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index d12053d8b..6915186d5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -702,6 +702,9 @@ public class AdapayService { if (settleCount == null) { throw new BusinessException("", "申请取现接口发生异常"); } + if (AdapayStatusEnum.FAILED.getValue().equals(settleCount.get("status"))) { + throw new BusinessException((String) settleCount.get("error_code"), (String) settleCount.get("error_msg")); + } String id = (String) settleCount.get("id");