From 4139a8029831dedc0cafd95b3901504dcf9e2725 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 8 Jul 2023 16:31:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?update=20=E8=AE=BE=E7=BD=AE=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index fc27ac94a..844b2d0ed 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -529,7 +529,7 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { // 只修改一个枪口的状态 num = pileConnectorInfoMapper.updateConnectorStatus(pileConnectorCode, status); deleteRedisByPileSn(pileSn); - redisCache.setCacheObject(redisKey, status); + redisCache.setCacheObject(redisKey, status, CacheConstants.cache_expire_time_1h); // TODO 推送联联平台 设备状态变化推送接口 ConnectorStatusInfo From 5f9586e7e2c32ef97f217e9d113372855ac7ec59 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 10 Jul 2023 10:07:59 +0800 Subject: [PATCH 2/5] update --- .../impl/OrderBasicInfoServiceImpl.java | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) 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 f5462169b..81b270201 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 @@ -16,7 +16,6 @@ import com.huifu.adapay.model.Refund; import com.jsowell.adapay.common.CreateAdaPaymentParam; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; -import com.jsowell.common.core.domain.entity.SysDictData; import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.domain.ykc.RealTimeMonitorData; import com.jsowell.common.core.domain.ykc.TransactionRecordsData; @@ -2141,22 +2140,22 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 微信支付 dto.setOrderBasicInfo(orderInfo); + Map weixinMap = adapayPayOrder(dto); // 从字典中获取使用汇付支付的站点 - List adapay_station = DictUtils.getDictCache("adapay_station"); - List stationIdList = Lists.newArrayList(); - if (CollectionUtils.isNotEmpty(adapay_station)) { - for (SysDictData sysDictData : adapay_station) { - stationIdList.add(sysDictData.getDictValue()); - } - } - Map weixinMap; - if (stationIdList.contains(orderInfo.getStationId())) { - logger.info("该站点:{}在字典中配置了使用汇付支付", orderInfo.getStationId()); - weixinMap = adapayPayOrder(dto); - } else { - logger.info("该站点:{}使用微信支付", orderInfo.getStationId()); - weixinMap = wechatPayOrder(dto); - } + // List adapay_station = DictUtils.getDictCache("adapay_station"); + // List stationIdList = Lists.newArrayList(); + // if (CollectionUtils.isNotEmpty(adapay_station)) { + // for (SysDictData sysDictData : adapay_station) { + // stationIdList.add(sysDictData.getDictValue()); + // } + // } + // if (stationIdList.contains(orderInfo.getStationId())) { + // logger.info("该站点:{}在字典中配置了使用汇付支付", orderInfo.getStationId()); + // weixinMap = adapayPayOrder(dto); + // } else { + // logger.info("该站点:{}使用微信支付", orderInfo.getStationId()); + // weixinMap = wechatPayOrder(dto); + // } // 返回微信支付参数 resultMap.put("weixinMap", weixinMap); From 2b55492856445e680d3a6cbd79ce14e6148fb39a Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 10 Jul 2023 10:06:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=81=9A=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit c1e5d6201ec5e16946f7eed9b59d2648c29c8fc5) --- .../pile/OrderBasicInfoController.java | 3 +- .../pile/dto/QueryMerchantOrderDTO.java | 69 +++++++++++++++++++ .../com/jsowell/pile/dto/QueryOrderDTO.java | 6 +- .../pile/mapper/OrderBasicInfoMapper.java | 7 +- .../pile/service/IOrderBasicInfoService.java | 2 +- .../impl/OrderBasicInfoServiceImpl.java | 2 +- 6 files changed, 78 insertions(+), 11 deletions(-) create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantOrderDTO.java diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index 67d902d53..4988d2cff 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -13,6 +13,7 @@ import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.dto.ManualSettlementDTO; +import com.jsowell.pile.dto.QueryMerchantOrderDTO; import com.jsowell.pile.dto.QueryOrderDTO; import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IPileMerchantInfoService; @@ -155,7 +156,7 @@ public class OrderBasicInfoController extends BaseController { */ @PreAuthorize("@ss.hasPermi('order:order:list')") @PostMapping("/getMerchantOrderList") - public TableDataInfo getMerchantOrderList(@RequestBody QueryOrderDTO dto) { + public TableDataInfo getMerchantOrderList(@RequestBody QueryMerchantOrderDTO dto) { return getDataTable(orderBasicInfoService.getMerchantOrderInfoList(dto)); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantOrderDTO.java new file mode 100644 index 000000000..e501b66da --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantOrderDTO.java @@ -0,0 +1,69 @@ +package com.jsowell.pile.dto; + +import lombok.Data; + +/** + * 获取运营商订单列表dto + * + * @author Lemon + * @Date 2023/7/10 9:56 + */ +@Data +public class QueryMerchantOrderDTO { + /** + * 充电桩编号 + */ + private String pileSn; + + /** + * 枪口号 + */ + private String connectorCode; + + /** + * 会员id + */ + private String memberId; + + /** + * 订单状态 + */ + private String orderStatus; + + /** + * 订单编号 + */ + private String orderCode; + + // 交易流水号 + private String transactionCode; + + /** + * 手机号 + */ + private String mobileNumber; + + /** + * 站点Id + */ + private String stationId; + + /** + * 运营商Id + */ + private String merchantId; + + /** + * 开始时间 + */ + private String startTime; + + /** + * 结束时间 + */ + private String endTime; + + private int pageSize; + + private int pageNum; +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java index b648563c6..c05a17bc7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java @@ -64,7 +64,7 @@ public class QueryOrderDTO extends BaseEntity { */ private String endTime; - private int pageSize; - - private int pageNum; + // private int pageSize; + // + // private int pageNum; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java index 2d14f868c..92a63dcb8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java @@ -2,10 +2,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.OrderDetail; -import com.jsowell.pile.dto.IndexQueryDTO; -import com.jsowell.pile.dto.QueryOrderDTO; -import com.jsowell.pile.dto.QueryPersonPileDTO; -import com.jsowell.pile.dto.QueryStationInfoDTO; +import com.jsowell.pile.dto.*; import com.jsowell.pile.vo.base.MerchantOrderInfoVO; import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; import com.jsowell.pile.vo.uniapp.OrderVO; @@ -217,5 +214,5 @@ public interface OrderBasicInfoMapper { * @param dto * @return */ - List getMerchantOrderInfoList(@Param("dto") QueryOrderDTO dto); + List getMerchantOrderInfoList(@Param("dto") QueryMerchantOrderDTO dto); } 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 ed007cee1..e1ea06571 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 @@ -277,7 +277,7 @@ public interface IOrderBasicInfoService { * 获取运营商订单列表 * @return */ - List getMerchantOrderInfoList(QueryOrderDTO dto); + List getMerchantOrderInfoList(QueryMerchantOrderDTO dto); /** * 生成订单逻辑 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 f5462169b..491009283 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 @@ -2065,7 +2065,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { * @return */ @Override - public List getMerchantOrderInfoList(QueryOrderDTO dto) { + public List getMerchantOrderInfoList(QueryMerchantOrderDTO dto) { int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum(); int pageSize = dto.getPageSize() == 0 ? 10 : dto.getPageSize(); String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7)); From 6f7b65799c71a727af4df1b92aaa59c345317d78 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 10 Jul 2023 11:27:03 +0800 Subject: [PATCH 4/5] update --- .../pile/merchant/components/adapayMember.vue | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue index 2188d88eb..a849aaffc 100644 --- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue +++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue @@ -183,7 +183,7 @@
{{auditStatus(adapayCorpMember.auditState)}}
{{adapayCorpMember.auditDesc}}
审核不成功，需要重新填写信息 - 新建 + 新建
@@ -332,6 +332,7 @@ export default { props: ["merchantId"], data() { return { + areaList:[], bankValue:'', cityList:[], // 银行代码JSON数据 showAdapayCorp:null, @@ -662,7 +663,8 @@ export default { console.log(this.dialogImageUrl); }, areaCode(area){ - let arr = this.options.find(item => item.cities[0].value == area) + let arr = this.areaList.find(item => item.value === area); + console.log("areaCode code:{}, value:{}", area, arr); if (arr ==null){ return '一' } else{ @@ -671,7 +673,9 @@ export default { }, provCode(code){ - let arr = this.options.find(item => item.value == code) + let arr = this.options.find(item => item.value === code); + this.areaList=arr.cities + console.log("provCode code:{}, value:{}", code, arr); if (arr ==null){ return '一' } else{ @@ -749,7 +753,10 @@ export default { created() { this.selectAdapayMember(); this.jsonHttp(); - this.cityList = text.cityList + this.cityList = text.cityList; + + this.provCode("6202"); + this.areaCode("0062"); }, }; From e25277c83c91d8c60af0a9171e38f7dc2c45b086 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 10 Jul 2023 11:45:57 +0800 Subject: [PATCH 5/5] update --- .../src/views/pile/merchant/components/adapayMember.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue index a849aaffc..a5fc22ffa 100644 --- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue +++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue @@ -664,7 +664,7 @@ export default { }, areaCode(area){ let arr = this.areaList.find(item => item.value === area); - console.log("areaCode code:{}, value:{}", area, arr); + // console.log("areaCode code:{}, value:{}", area, arr); if (arr ==null){ return '一' } else{ @@ -675,7 +675,7 @@ export default { provCode(code){ let arr = this.options.find(item => item.value === code); this.areaList=arr.cities - console.log("provCode code:{}, value:{}", code, arr); + // console.log("provCode code:{}, value:{}", code, arr); if (arr ==null){ return '一' } else{ @@ -755,8 +755,8 @@ export default { this.jsonHttp(); this.cityList = text.cityList; - this.provCode("6202"); - this.areaCode("0062"); + // this.provCode("6202"); + // this.areaCode("0062"); }, };