autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-14 15:00:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 定时任务扫描支付成功未启动订单，排除第三方启动的订单

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-01-11 14:26:02 +08:00
parent 64ca3d4154
commit 7f56f4a48b
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -576,10 +576,17 @@ public class SpringBootTestController {
public void queryPaymentConfirmListTest() { public void queryPaymentConfirmListTest() {
QueryPaymentConfirmDTO dto = new QueryPaymentConfirmDTO(); QueryPaymentConfirmDTO dto = new QueryPaymentConfirmDTO();
dto.setWechatAppId(wechatAppId1); dto.setWechatAppId(wechatAppId1);
// dto.setPaymentId("0022120230910032226990546664907296944128"); dto.setPaymentId("002212023122208033310584061601344237568");
dto.setPaymentConfirmId("0022120231009032351990557174514064834560"); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(dto);
QueryPaymentConfirmDetailResponse.PaymentConfirmInfo paymentConfirmInfo = adapayService.queryPaymentConfirmDetail(dto); List<QueryPaymentConfirmDetailResponse.PaymentConfirmInfo> paymentConfirms = response.getPaymentConfirms();
System.out.println(JSON.toJSONString(paymentConfirmInfo)); // 如果没有分账信息，说明没有清分
String clearingStatus = null;
if (org.springframework.util.CollectionUtils.isEmpty(paymentConfirms)) {
clearingStatus = "未清分";
} else {
clearingStatus = "已清分";
}
System.out.println(clearingStatus);
} }
@Test @Test
@@ -688,10 +695,7 @@ public class SpringBootTestController {
// 需要重新分账的订单信息（针对未分账的订单） // 需要重新分账的订单信息（针对未分账的订单）
public JSONArray getPaymentList() { public JSONArray getPaymentList() {
String jsonArrayString = "[" + String jsonArrayString = "[" +
"{\"orderCode\":\"C21350495809\", \"settleAmount\":\"12.75\", \"paymentId\":\"002212023102607502510563402189752061952\"}" + "{\"orderCode\":\"C82585387230\", \"settleAmount\":\"20.10\", \"paymentId\":\"002212023122208033310584061601344237568\"}" +
"{\"orderCode\":\"C48300427818\", \"settleAmount\":\"14.99\", \"paymentId\":\"002212023102717582410563917580340862976\"}" +
"{\"orderCode\":\"C42052601299\", \"settleAmount\":\"5.91\", \"paymentId\":\"002212023102916284510564619797265641472\"}" +
"{\"orderCode\":\"C80224392857\", \"settleAmount\":\"29.91\", \"paymentId\":\"002212023103116134010565340774007672832\"}" +
"]"; "]";
return JSONArray.parseArray(jsonArrayString); return JSONArray.parseArray(jsonArrayString);
} }
@@ -705,7 +709,7 @@ public class SpringBootTestController {
// TODO 获取默认结算账户，如需分给对应商户就填写正确的汇付会员id // TODO 获取默认结算账户，如需分给对应商户就填写正确的汇付会员id
// AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.getDefault(); // AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.getDefault();
AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount(); AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount();
adapayMemberAccount.setAdapayMemberId("ACM67738893"); adapayMemberAccount.setAdapayMemberId("ACM65835351");
for (int i = 0; i < paymentList.size(); i++) { for (int i = 0; i < paymentList.size(); i++) {
JSONObject jsonObject = (JSONObject) paymentList.get(i); JSONObject jsonObject = (JSONObject) paymentList.get(i);
BigDecimal confirmAmt = jsonObject.getBigDecimal("settleAmount"); // 确认金额就是结算金额 BigDecimal confirmAmt = jsonObject.getBigDecimal("settleAmount"); // 确认金额就是结算金额

3
jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java vendored
View File

@@ -1,6 +1,5 @@
package com.jsowell.common.enums.thirdparty; package com.jsowell.common.enums.thirdparty;
import com.jsowell.common.enums.ykc.ChargingFailedReasonEnum;
import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.StringUtils;
/** /**
@@ -14,7 +13,7 @@ public enum ThirdPlatformTypeEnum {
ZHONG_DIAN_LIAN_PLATFORM("2", "中电联平台"), ZHONG_DIAN_LIAN_PLATFORM("2", "中电联平台"),
JIANG_SU_PLATFORM("3", "江苏省平台"), JIANG_SU_PLATFORM("3", "江苏省平台"),
YONG_CHENG_BO_CHE("4", "甬城泊车平台"), YONG_CHENG_BO_CHE("4", "甬城泊车平台"),
XIN_DIAN_TU("6", "新电途平台"); XIN_DIAN_TU("6", "新电途平台"),
; ;
private String code; private String code;

1
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -2331,6 +2331,7 @@
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from order_basic_info from order_basic_info
where del_flag = '0' where del_flag = '0'
and start_mode != '4'
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
and create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR} and create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
</if> </if>