From 24716f59be59f99c95b02f2f66d211ce0bcfd5d1 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Mon, 25 Dec 2023 11:17:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=9C=A8=E4=BD=BF=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E5=95=86=E6=88=B7=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fuint/api/fuyou/service/impl/FyPayServiceImpl.java | 5 ++++- .../integral/service/impl/IntegralOrdersServiceImpl.java | 2 +- .../cardFule/service/impl/CardFuelRecordServiceImpl.java | 2 +- .../service/impl/CardValueRecordServiceImpl.java | 4 ++-- .../business/order/mapper/xml/CashierOrderMapper.xml | 1 + .../fuint/business/order/mapper/xml/LJOrderMapper.xml | 1 + .../business/order/service/impl/HangBillServiceImpl.java | 9 +++++---- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java index 2ec27ff8f..14b15654f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java @@ -18,6 +18,8 @@ import com.fuint.business.order.entity.*; import com.fuint.business.order.service.*; import com.fuint.business.userManager.service.LJUserService; import com.fuint.business.userManager.vo.LJUserVo; +import com.fuint.common.dto.AccountInfo; +import com.fuint.common.util.TokenUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -114,6 +116,7 @@ public class FyPayServiceImpl implements FyPayService { @Override public Map queryOrder(Map map1) throws Exception { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); Map resMap =new HashMap<>(); resMap.put("msg","error"); try { @@ -148,7 +151,7 @@ public class FyPayServiceImpl implements FyPayService { List list = oilOrderService.selectOilOrder(orderNo); LJOrder goodsOrder = goodsOrderService.selectGoodsOrder(orderNo); CashierOrder cashierOrder = cashierOrderService.selectCashierOrder(orderNo); - MerchantConfig merchantConfig = merchantConfigService.selectMeChByIsUse("1"); + MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(nowAccountInfo.getStoreId()); List returnRecords = returnRecordService.selectReturnRecordByOrderNo(orderNo); Date date = new Date(); if (reqMap.get("trans_stat").equals("SUCCESS")){ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java index b17963b7b..ad3ec3d9a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java @@ -204,7 +204,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService { // Integer allAmount = (int) (integralOrdersList.getAllAmout()*100); System.out.println("金额"+(int) (integralOrdersList.getAllAmout()*100)); Integer allAmount = (int) (0.01*100); - MerchantConfig merchantConfig = merchantConfigService.selectMeChByIsUse("1"); + MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(nowAccountInfo.getStoreId()); // 处理支付需要的数据 Map map = new HashMap<>(); map.put("authCode",integralOrdersList.getAuthCode()); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java index d9f0b685e..15287e0b4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java @@ -179,7 +179,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { Integer allAmount = (int) (0.01 * 100); - MerchantConfig merchantConfig = merchantConfigService.selectMeChByIsUse("1"); + MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(nowAccountInfo.getStoreId()); // 处理支付需要的数据 Map map = new HashMap<>(); map.put("authCode", cardFuelRecordDTO.getAuthCode()); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index be9e6f1e7..62380ae40 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -114,7 +114,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl map = new HashMap<>(); map.put("authCode",cardValueRecordDTO.getAuthCode()); map.put("allAmount",cardValueOrders.getAmount().toString()); @@ -205,7 +205,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl map = new HashMap<>(); map.put("authCode",cardValueRecordDTO.getAuthCode()); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml index a4af2f285..d37e65bd5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml @@ -24,6 +24,7 @@ and date_format(pay_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d') + order by pay_time desc