From 8874db567668d8aef778fb54090299f9bb42413a Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 3 Aug 2023 17:14:10 +0800 Subject: [PATCH 1/7] =?UTF-8?q?update=20=E4=BC=9A=E5=91=98=E5=8C=BA?= =?UTF-8?q?=E5=88=86=E4=B8=80=E7=BA=A7=E8=BF=90=E8=90=A5=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/MemberService.java | 2 +- .../java/com/jsowell/service/PileService.java | 2 +- .../pile/domain/PileStationWhitelist.java | 10 +++++++++ .../com/jsowell/pile/dto/PileAuthCardDTO.java | 2 ++ .../pile/dto/PileMemberBindingDTO.java | 2 ++ .../pile/service/IMemberBasicInfoService.java | 2 +- .../impl/MemberBasicInfoServiceImpl.java | 8 +++---- .../service/impl/PileAuthCardServiceImpl.java | 22 +++++++++---------- .../impl/PileStationWhitelistServiceImpl.java | 2 +- .../pile/PileStationWhitelistMapper.xml | 7 +++++- 10 files changed, 38 insertions(+), 21 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 5a793ec06..7abb9187d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -137,7 +137,7 @@ public class MemberService { // throw new BusinessException(ReturnCodeEnum.CODE_GET_MERCHANT_ID_BY_APP_ID_ERROR); // } // 查询手机号码是否注册过 - MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber); + MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber, merchantId); if (Objects.isNull(memberBasicInfo)) { // 不存在则新增数据 String memberId = generateNewMemberId(); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index 94e8f2056..214b84151 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -354,7 +354,7 @@ public class PileService { // 通过前端传的手机号查询是否有此用户 - MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber()); + MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), dto.getMerchantId()); if (memberBasicInfo == null) { // 为空说明此用户未注册平台账号 throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationWhitelist.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationWhitelist.java index 04c298d36..79c1fffff 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationWhitelist.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationWhitelist.java @@ -2,6 +2,8 @@ package com.jsowell.pile.domain; import com.jsowell.common.annotation.Excel; import com.jsowell.common.core.domain.BaseEntity; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,6 +13,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author jsowell * @date 2023-04-19 */ +@Getter +@Setter public class PileStationWhitelist extends BaseEntity { private static final long serialVersionUID = 1L; @@ -19,6 +23,12 @@ public class PileStationWhitelist extends BaseEntity { */ private Long id; + /** + * 运营商id + */ + @Excel(name = "运营商id") + private String merchantId; + /** * 站点id */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java index 7895c040b..e43098473 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java @@ -25,4 +25,6 @@ public class PileAuthCardDTO { private String phoneNumber; private String verificationCode; + + private String merchantId; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java index 8187a46bd..918a9a6ae 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java @@ -34,4 +34,6 @@ public class PileMemberBindingDTO { * 用户memberId */ private String memberId; + + private String merchantId; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java index efdb63519..a6de2151b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java @@ -80,7 +80,7 @@ public interface IMemberBasicInfoService { * @param mobileNumber 手机号 * @return */ - MemberBasicInfo selectInfoByMobileNumber(String mobileNumber); + // MemberBasicInfo selectInfoByMobileNumber(String mobileNumber); /** * 根据会员id查询会员信息 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index 63bed2157..0a7a1ccb0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -142,10 +142,10 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { return memberBasicInfoMapper.selectInfoByMobileNumberAndMerchantId(mobileNumber, merchantId); } - @Override - public MemberBasicInfo selectInfoByMobileNumber(String mobileNumber) { - return selectInfoByMobileNumber(mobileNumber, null); - } + // @Override + // public MemberBasicInfo selectInfoByMobileNumber(String mobileNumber) { + // return selectInfoByMobileNumber(mobileNumber, null); + // } @Override public MemberBasicInfo selectInfoByMemberId(String memberId) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java index d730f3b43..c43698e70 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java @@ -1,25 +1,23 @@ package com.jsowell.pile.service.impl; -import java.math.BigDecimal; -import java.util.List; -import java.util.Locale; - import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; -import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberBasicInfo; -import com.jsowell.pile.dto.MemberRegisterAndLoginDTO; +import com.jsowell.pile.domain.PileAuthCard; import com.jsowell.pile.dto.PileAuthCardDTO; +import com.jsowell.pile.mapper.PileAuthCardMapper; import com.jsowell.pile.service.IMemberBasicInfoService; +import com.jsowell.pile.service.IPileAuthCardService; import com.jsowell.pile.vo.uniapp.AuthCardVO; import com.jsowell.pile.vo.web.PileAuthCardVO; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.jsowell.pile.mapper.PileAuthCardMapper; -import com.jsowell.pile.domain.PileAuthCard; -import com.jsowell.pile.service.IPileAuthCardService; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Locale; /** * 充电站鉴权卡Service业务层处理 @@ -108,7 +106,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService { memberBasicInfo.setStatus("0"); // 0-待激活 }else { // 通过手机号查询memberId - memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber()); + memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), dto.getMerchantId()); if (memberBasicInfo == null) { // 为空则说明未查到该用户的注册信息 throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER); @@ -139,7 +137,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService { @Override public int updateCardInfo(PileAuthCardDTO dto) { // 通过手机号查询memberId - MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber()); + MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), dto.getMerchantId()); if (memberBasicInfo == null) { // 为空则说明未查到该用户的注册信息 throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER); @@ -228,7 +226,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService { public int bindAuthCard(PileAuthCardDTO dto) { String phoneNumber = dto.getPhoneNumber(); // 判断此用户是否已注册小程序账号 - MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber); + MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber, dto.getMerchantId()); if (memberBasicInfo == null) { throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java index a0c98343b..f33ec7dce 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java @@ -62,7 +62,7 @@ public class PileStationWhitelistServiceImpl implements IPileStationWhitelistSer if (StringUtils.isBlank(pileStationWhitelist.getMobileNumber())) { throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); } - MemberBasicInfo memberInfo = memberBasicInfoService.selectInfoByMobileNumber(pileStationWhitelist.getMobileNumber()); + MemberBasicInfo memberInfo = memberBasicInfoService.selectInfoByMobileNumber(pileStationWhitelist.getMobileNumber(), pileStationWhitelist.getMerchantId()); if (memberInfo == null) { throw new BusinessException(ReturnCodeEnum.CODE_MEMBER_NOT_FOUND_ERROR); } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml index 6ce1738e3..d33ebdf81 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml @@ -6,6 +6,7 @@ + @@ -17,7 +18,7 @@ - id, station_id, member_id, mobile_number, create_time, create_by, update_time, update_by, del_flag + id, merchant_id, station_id, member_id, mobile_number, create_time, create_by, update_time, update_by, del_flag @@ -29,6 +30,7 @@ + + \ No newline at end of file diff --git a/jsowell-ui/src/api/adapayMember/adapayMember.js b/jsowell-ui/src/api/adapayMember/adapayMember.js index e0f39b01a..3490b211a 100644 --- a/jsowell-ui/src/api/adapayMember/adapayMember.js +++ b/jsowell-ui/src/api/adapayMember/adapayMember.js @@ -19,7 +19,7 @@ export function selectAdapayMember(data) { // 营收报表 export function getMerchantOrderReport(data) { return request({ - url: '/pile/report/getMerchantOrderReport', + url: '/order/report/getMerchantOrderReport', method: 'post', data: data }) @@ -72,4 +72,4 @@ export function withdraw(data) { method: 'post', data: data }) -} \ No newline at end of file +} diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue index dcf8ab24a..4fef60e49 100644 --- a/jsowell-ui/src/views/pile/merchant/index.vue +++ b/jsowell-ui/src/views/pile/merchant/index.vue @@ -256,6 +256,32 @@ + + + + + + + + + + + + + + + + Date: Thu, 3 Aug 2023 18:05:46 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E5=9D=90?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-ui/src/components/MapContainer/MapContainer.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jsowell-ui/src/components/MapContainer/MapContainer.vue b/jsowell-ui/src/components/MapContainer/MapContainer.vue index ea9f29442..4f3ade0ff 100644 --- a/jsowell-ui/src/components/MapContainer/MapContainer.vue +++ b/jsowell-ui/src/components/MapContainer/MapContainer.vue @@ -125,10 +125,16 @@ export default { // let lnglat = [lng, lat]; // console.log("经纬度", lnglat); }); + marker.on("click", (e) => { + let lat = e.lnglat.lat; + let lng = e.lnglat.lng; + this.getLngLatService(lat, lng); + }); }) .catch((e) => { console.log(e); }); + }, select(e) { this.placeSearch.search(e.poi.name); //关键字查询查询 From 57f34e5836c0457b202361432b856165768a295b Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 3 Aug 2023 18:53:24 +0800 Subject: [PATCH 5/7] update --- .../test/java/SpringBootTestController.java | 18 +++++++++++ .../adapay/service/AdapayMemberService.java | 13 ++++++++ .../pile/service/IOrderBasicInfoService.java | 5 ++- .../impl/OrderBasicInfoServiceImpl.java | 32 +++++++++++++------ 4 files changed, 57 insertions(+), 11 deletions(-) diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 50a2a7839..fe1b336e1 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -189,6 +189,24 @@ public class SpringBootTestController { @Autowired private ClearingWithdrawInfoService clearingWithdrawInfoService; + @Test + public void testCreateConfirmReverse() throws BaseAdaPayException { + List list = Lists.newArrayList(); + list.add("0022120230803181514990533118848148987904"); + list.add("0022120230803181514990533118849771606016"); + list.add("0022120230803181514990533118851194695680"); + list.add("0022120230803181515990533118852380536832"); + list.add("0022120230803181515990533118853825003520"); + list.add("0022120230803181515990533118855098966016"); + list.add("0022120230803181516990533118856510251008"); + list.add("0022120230803181516990533118858177568768"); + list.add("0022120230803181517990533118859674951680"); + list.add("0022120230803181517990533118861063364608"); + for (String s : list) { + adapayMemberService.createConfirmReverse(s); + } + } + @Test public void testClearingWithdraw() { // 保存提现记录 diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java index 198abc344..985dbe737 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java @@ -563,4 +563,17 @@ public class AdapayMemberService { Map paymentResult = AdapayCommon.requestAdapay(balanceParam); log.info("创建余额支付param:{}, result:{}", JSON.toJSONString(balanceParam), JSON.toJSONString(paymentResult)); } + + /** + * 创建支付确认撤销 + */ + public void createConfirmReverse(String paymentConfirmId) throws BaseAdaPayException { + Map confirmReverseParams = Maps.newHashMap(); + confirmReverseParams.put("adapay_func_code", "payments.confirm.reverse"); + confirmReverseParams.put("payment_confirm_id", paymentConfirmId); + confirmReverseParams.put("reason", "支付确认撤销"); + confirmReverseParams.put("order_no", IdUtils.fastSimpleUUID()); + Map confirmReverseResult = AdapayCommon.requestAdapay(confirmReverseParams); + log.info("创建支付确认撤销param:{}, result:{}", JSON.toJSONString(confirmReverseParams), JSON.toJSONString(confirmReverseResult)); + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java index 09c95373b..09c1c709a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java @@ -7,6 +7,7 @@ import com.jsowell.common.core.domain.ykc.TransactionRecordsData; import com.jsowell.pile.domain.AdapayMemberAccount; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.OrderDetail; +import com.jsowell.pile.domain.SettleOrderReport; import com.jsowell.pile.dto.*; import com.jsowell.pile.vo.base.MerchantOrderInfoVO; import com.jsowell.pile.vo.base.OrderAmountDetailVO; @@ -142,7 +143,9 @@ public interface IOrderBasicInfoService { List getListByMemberIdAndOrderStatus(String memberId, List orderStatusList, LocalDateTime dateTime, String stationId); - void orderSplittingOperations(String merchantId, String tradeDate); + void orderSplittingOperations(AdapayMemberAccount adapayMemberAccount, List stationReportList); + + void orderSplittingOperations(String merchantId, String tradeDate); void tempOrderSplittingOperations(String merchantId, String tradeDate); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 39f9a8342..3fd664ded 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -873,22 +873,22 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { * 只有开通结算账户的运营商才走分账逻辑 */ @Override - public void orderSplittingOperations(String merchantId, String tradeDate) { - logger.info("运营商:{}, 交易日期:{}, 进行分账处理start", merchantId, tradeDate); + public void orderSplittingOperations(AdapayMemberAccount adapayMemberAccount, List stationReportList) { + logger.info("运营商:{}, 交易日期:{}, 进行分账处理start", adapayMemberAccount, stationReportList); - // 查询运营商有没有开通结算账户 - AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); + // 运营商有没有开通结算账户 if (adapayMemberAccount == null) { - logger.error("订单分账逻辑error, 运营商id:{}, 未配置结算账户", merchantId); return; } - // 根据交易日期查询运营商下面所有站点的交易日报 - List stationReportList = settleOrderReportService.selectByMerchantIdAndDate(merchantId, tradeDate); + if (CollectionUtils.isEmpty(stationReportList)) { + return; + } + for (SettleOrderReport orderReport : stationReportList) { String orderCodes = orderReport.getOrderCodes(); if (StringUtils.isBlank(orderCodes)) { - logger.info("站点:{}, 日期:{}, 没有查到订单数据", orderReport.getStationId(), tradeDate); + logger.info("站点:{}, 日期:{}, 没有查到订单数据", orderReport.getStationId(), orderReport.getTradeDate()); continue; } List orderCodeList = Lists.newArrayList(StringUtils.split(orderCodes, ",")); @@ -903,7 +903,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { String clearingBillCode = "CLE" + IdUtils.getOrderCode(); clearingBillInfo.setClearingBillCode(clearingBillCode); clearingBillInfo.setClearingTime(DateUtils.getNowDate()); - clearingBillInfo.setMerchantId(merchantId); + clearingBillInfo.setMerchantId(orderReport.getMerchantId()); clearingBillInfo.setOrderSource("1"); // 应收金额 @@ -967,9 +967,21 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { dto.setBillDetailList(billDetailList); transactionService.createClearingBill(dto); } - logger.info("运营商:{}, 交易日期:{}, 进行分账处理end", merchantId, tradeDate); } + @Override + public void orderSplittingOperations(String merchantId, String tradeDate) { + // 查询运营商有没有开通结算账户 + AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); + if (adapayMemberAccount == null) { + logger.error("订单分账逻辑error, 运营商id:{}, 未配置结算账户", merchantId); + return; + } + + // 根据交易日期查询运营商下面所有站点的交易日报 + List stationReportList = settleOrderReportService.selectByMerchantIdAndDate(merchantId, tradeDate); + orderSplittingOperations(adapayMemberAccount, stationReportList); + } /** * 手动接口执行订单分账逻辑 * 8月1号之前的交易，全部结算到本商户 From cbd8da535b06bc86cdb197ed87ca3cc814be3121 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 3 Aug 2023 18:59:26 +0800 Subject: [PATCH 6/7] update --- .../src/main/java/com/jsowell/api/uniapp/TempController.java | 3 ++- .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index 48ad71eab..00e8e61ae 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -201,7 +201,8 @@ public class TempController extends BaseController { List dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime); for (String tradeDate : dateList) { - orderBasicInfoService.tempOrderSplittingOperations(dto.getMerchantId(), tradeDate); + // orderBasicInfoService.tempOrderSplittingOperations(dto.getMerchantId(), tradeDate); + orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate); } response = new RestApiResponse<>(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 3fd664ded..9c7a2544e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -878,10 +878,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 运营商有没有开通结算账户 if (adapayMemberAccount == null) { + logger.error("订单分账逻辑error-运营商有没有开通结算账户"); return; } if (CollectionUtils.isEmpty(stationReportList)) { + logger.error("订单分账逻辑error-stationReportList为空"); return; } From b0d56273a6f929a47a11e9b795ca19750a17adee Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 3 Aug 2023 19:00:32 +0800 Subject: [PATCH 7/7] update --- .../com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 9c7a2544e..2cf1b031f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -984,6 +984,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { List stationReportList = settleOrderReportService.selectByMerchantIdAndDate(merchantId, tradeDate); orderSplittingOperations(adapayMemberAccount, stationReportList); } + /** * 手动接口执行订单分账逻辑 * 8月1号之前的交易，全部结算到本商户