From 109852819319f3443026f6eace6ccaf41c780f4a Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Tue, 23 May 2023 10:30:53 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/impl/StoreOrderServiceImpl.java     | 10 +++++++++
 .../yudao/module/system/api/dept/DeptApi.java | 12 ++++++++++
 .../module/system/api/dept/DeptApiImpl.java   | 16 ++++++++++++++
 .../system/service/dept/DeptService.java      | 13 +++++++++++
 .../system/service/dept/DeptServiceImpl.java  | 22 +++++++++++++++++++
 5 files changed, 73 insertions(+)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
index b276db42f..10cb26d90 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
@@ -52,6 +52,8 @@ import cn.iocoder.yudao.module.shop.utils.RedisUtil;
 import cn.iocoder.yudao.module.shop.vo.order.LogisticsResultVo;
 import cn.iocoder.yudao.module.shop.vo.order.StoreDateRangeSqlPram;
 import cn.iocoder.yudao.module.shop.vo.order.StoreOrderInfoOldVo;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.internal.util.AlipaySignature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -147,6 +149,8 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
     @Autowired
     private WxMpService wxMpService;
 
+    private DeptApi deptApi;
+
     /**
      * 列表（PC）
      *
@@ -1360,6 +1364,12 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
 
     private RechargeOrderDO initializeOrder(OrderContentRequest request, String code, MemberUserRespDTO user, PromoterDTO promoterDTO) {
         Long tenantId = TenantContextHolder.getTenantId();
+        Long deptId = promoterDTO.getDeptId();
+        if(deptId==null){
+            DeptRespDTO deptRespDTO = deptApi.findParentDept(tenantId);
+            deptId = deptRespDTO.getId();
+        }
+
         RechargeOrderDO orderDO = new RechargeOrderDO();
         List<OrderContentRequest.OrderInfo> orderInfos = request.getOrderInfos();
         orderDO.setOrderId(code);
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java
index ebefd9756..2111d51b7 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java
@@ -48,6 +48,18 @@ public interface DeptApi {
      */
     void validateDeptList(Collection<Long> ids);
 
+    /**
+    * <pre>
+    * <b>findParentDept</b>
+    * <b>Description:查询当前租户根节点</b>
+    * <b>@author:</b> zenghuapei
+    * <b>@date:</b> 2023/5/23 09:38
+    * @param :
+    * @return
+    * </pre>
+    */
+    DeptRespDTO findParentDept(Long tenantId);
+
     /**
      * 获得指定编号的部门 Map
      *
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
index bf679107d..ca7f84640 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
@@ -38,6 +38,22 @@ public class DeptApiImpl implements DeptApi {
         List<DeptDO> depts = deptService.getDeptList(new DeptListReqVO());
         return DeptConvert.INSTANCE.convertList03(depts);
     }
+
+    /**
+     * <pre>
+     * <b>findParentDept</b>
+     * <b>Description:查询当前租户根节点</b>
+     * <b>@author:</b> zenghuapei
+     * <b>@date:</b> 2023/5/23 09:38
+     * @return
+     * </pre>
+     */
+    @Override
+    public DeptRespDTO findParentDept(Long tenantId) {
+        DeptDO deptDO = deptService.findParentDept(tenantId );
+        return DeptConvert.INSTANCE.convert03(deptDO);
+    }
+
     @Override
     public void validateDeptList(Collection<Long> ids) {
         deptService.validateDeptList(ids);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java
index 87033d4b3..6d68c3d51 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.service.dept;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO;
@@ -54,6 +55,18 @@ public interface DeptService {
      */
     List<DeptDO> getDeptList(DeptListReqVO reqVO);
 
+    /**
+    * <pre>
+    * <b>findParentDept</b>
+    * <b>Description:查询根节点</b>
+    * <b>@author:</b> zenghuapei
+    * <b>@date:</b> 2023/5/23 09:40
+    * @param tenantId:
+    * @return
+    * </pre>
+    */
+    DeptDO findParentDept(Long tenantId);
+
     /**
      * 获得所有子部门，从缓存中
      *
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
index 89f98f8b9..0fb718f13 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO;
@@ -13,6 +14,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper;
 import cn.iocoder.yudao.module.system.enums.dept.DeptIdEnum;
 import cn.iocoder.yudao.module.system.mq.producer.dept.DeptProducer;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
@@ -152,6 +154,26 @@ public class DeptServiceImpl implements DeptService {
         return deptMapper.selectList(reqVO);
     }
 
+
+    /**
+     * <pre>
+     * <b>findParentDept</b>
+     * <b>Description:查询根节点</b>
+     * <b>@author:</b> zenghuapei
+     * <b>@date:</b> 2023/5/23 09:40
+     * @param tenantId :
+     * @return
+     * </pre>
+     */
+    @Override
+    public DeptDO findParentDept(Long tenantId) {
+        List<DeptDO> deptDOs = deptMapper.selectList(Wrappers.lambdaQuery(DeptDO.class).eq(DeptDO::getParentId,DeptIdEnum.ROOT.getId()).eq(DeptDO::getTenantId,tenantId));
+        if(deptDOs!=null && deptDOs.size() > 0){
+            return deptDOs.get(0);
+        }
+        return null;
+    }
+
     @Override
     public List<DeptDO> getDeptListByParentIdFromCache(Long parentId, boolean recursive) {
         if (parentId == null) {

From 0e3b3bf667a1da8e24998ddf415540939fe7b13c Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Tue, 23 May 2023 10:34:09 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/member/controller/app/user/AppUserController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java
index 9121908f6..ba91db9ae 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java
@@ -116,7 +116,7 @@ public class AppUserController {
         List<UserSpreadBannerVO> list = new ArrayList<>();
         UserSpreadBannerVO userSpreadBannerVO = new UserSpreadBannerVO();
         userSpreadBannerVO.setId(1);
-        userSpreadBannerVO.setPic("http://192.168.1.147:48080/admin-api/infra/file/4/get/431efea27162d536d35f7b3c0b844ede98a6ba58f4fd72ac7181e7ee5ebae77a.jpg");
+        userSpreadBannerVO.setPic("http://image.cyywl.top/431efea27162d536d35f7b3c0b844ede98a6ba58f4fd72ac7181e7ee5ebae77a.jpg");
         userSpreadBannerVO.setTitle("推广背景图");
         list.add(userSpreadBannerVO);
         return CommonResult.success(list);

From bbb204191a909811a3fe84cd34ddd519e7347feb Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Tue, 23 May 2023 11:00:24 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-server/src/main/resources/application-prod.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml
index fef802529..9e5ffdb73 100644
--- a/yudao-server/src/main/resources/application-prod.yaml
+++ b/yudao-server/src/main/resources/application-prod.yaml
@@ -151,8 +151,8 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
       database: 16 # 数据库索引
       password: cyywl123.. # 密码，建议生产环境开启
     # 公众号配置(必填)
-    app-id: wx041349c6f39b268b
-    secret: 5abee519483bc9f8cb37ce280e814bd0
+    app-id: wx7e503d9cded34c07
+    secret: 31883ca14e2cbac8610d30f8f945ee47
     # 存储配置，解决 AccessToken 的跨节点的共享
     config-storage:
       type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取

From 032074a119caf318b5736302cb65a2b02ff977ba Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Tue, 23 May 2023 11:05:48 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-server/src/main/resources/application-prod.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml
index 9e5ffdb73..5bbf31b45 100644
--- a/yudao-server/src/main/resources/application-prod.yaml
+++ b/yudao-server/src/main/resources/application-prod.yaml
@@ -168,7 +168,7 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
   pay:
     one:
       enabled: true
-      app-id: wxb1826c88da21d81e
+      app-id: wx7e503d9cded34c07
       mch-id: 1641993417
       mch-key: qdn2I7Cmx4JeiKOt2CDjiu6UHgLTsOsM
       apiv3-key: cyywl666666cyywl888888cyywl66666

From 2adf4d610a872192ff4fe0be1a2e430052e7cb5c Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Tue, 23 May 2023 11:12:28 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-server/src/main/resources/application-prod.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml
index 5bbf31b45..6d7f99628 100644
--- a/yudao-server/src/main/resources/application-prod.yaml
+++ b/yudao-server/src/main/resources/application-prod.yaml
@@ -169,13 +169,13 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
     one:
       enabled: true
       app-id: wx7e503d9cded34c07
-      mch-id: 1641993417
+      mch-id: 1641073271
       mch-key: qdn2I7Cmx4JeiKOt2CDjiu6UHgLTsOsM
-      apiv3-key: cyywl666666cyywl888888cyywl66666
+      apiv3-key: cyywl123456cyywl654321cyywl12345
       private-cert-path: classpath:/1/apiclient_cert.pem
       private-key-path: classpath:/1/apiclient_key.pem
       key-path: classpath:/1/apiclient_cert.p12
-      cert-serial-no: 58FDB503F92B6C0E258C9940BB726C2BF6022E56
+      cert-serial-no: 7F76A4ADC52CA0B440C4E5698F8A5CD1633A0FCD
       notify-url: http://api.cyywl.top/app-api/pay/wxpay/pay_notify
       refund-notify-url: http://api.cyywl.top/app-api/pay/wxpay/refund_notify
     two:

From aa884231535634ee37784e8c1ffba4266822160b Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Tue, 23 May 2023 11:23:15 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=A1=A3=E6=AC=A1?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/StoreOrderDetailInfoResponse.java   |  4 ++
 .../recharge/RechargeGearServiceImpl.java     | 50 ++++++++-----------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/response/order/StoreOrderDetailInfoResponse.java b/yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/response/order/StoreOrderDetailInfoResponse.java
index b8663a3c1..931d07b87 100644
--- a/yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/response/order/StoreOrderDetailInfoResponse.java
+++ b/yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/response/order/StoreOrderDetailInfoResponse.java
@@ -1,9 +1,11 @@
 package cn.iocoder.yudao.module.shop.response.order;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -85,6 +87,8 @@ public class StoreOrderDetailInfoResponse implements Serializable {
     private String payType;
 
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @Schema(description = "订单状态（0：待发货；1：待收货；2：已收货，待评价；3：已完成；）")
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java
index a184481e6..7ce76a52e 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java
@@ -107,21 +107,16 @@ public class RechargeGearServiceImpl implements RechargeGearService {
         List<RechargeGearDO> rechargeGearDOS = rechargeGearMapper.selectList(Wrappers.<RechargeGearDO>lambdaQuery()
                 .eq(RechargeGearDO::getDeleted, 0));
         List<RechargeGearRespVO> rechargeGearRespVOS = RechargeGearConvert.INSTANCE.convertList(rechargeGearDOS);
-        RechargeOrderDO orderDO = orderMapper.selectOne(Wrappers.<RechargeOrderDO>lambdaQuery().eq(RechargeOrderDO::getUid, loginUser.getId())
-                        .eq(RechargeOrderDO::getPaid,1)
-                .last("LIMIT 1"));
-        if (Objects.nonNull(orderDO)) {
-            List<PhoneRecordDO> infoDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery().eq(PhoneRecordDO::getRechargeOrderId, orderDO.getId()));
-            Map<Long, List<PhoneRecordDO>> collect = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId));
-            rechargeGearRespVOS.forEach(vo -> {
-                List<PhoneRecordDO> infoDOS1 = collect.get(vo.getId());
-                if (!CollectionUtils.isEmpty(infoDOS1)) {
-                    vo.setIsExist("1");
-                } else {
-                    vo.setIsExist("0");
-                }
-            });
-        }
+        List<PhoneRecordDO> infoDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery().eq(PhoneRecordDO::getUserId, loginUser.getId()));
+        Map<Long, List<PhoneRecordDO>> collect = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId));
+        rechargeGearRespVOS.forEach(vo -> {
+            List<PhoneRecordDO> infoDOS1 = collect.get(vo.getId());
+            if (!CollectionUtils.isEmpty(infoDOS1)) {
+                vo.setIsExist("1");
+            } else {
+                vo.setIsExist("0");
+            }
+        });
         return rechargeGearRespVOS;
     }
 
@@ -130,21 +125,16 @@ public class RechargeGearServiceImpl implements RechargeGearService {
         List<RechargeGearDO> rechargeGearDOS = rechargeGearMapper.selectList(Wrappers.<RechargeGearDO>lambdaQuery()
                 .eq(RechargeGearDO::getDeleted, 0));
         List<RechargeGearRespVO> rechargeGearRespVOS = RechargeGearConvert.INSTANCE.convertList(rechargeGearDOS);
-        RechargeOrderDO orderDO = orderMapper.selectOne(Wrappers.<RechargeOrderDO>lambdaQuery().eq(RechargeOrderDO::getUserPhone, phone)
-                .eq(RechargeOrderDO::getPaid,1)
-                .last("LIMIT 1"));
-        if (Objects.nonNull(orderDO)) {
-            List<PhoneRecordDO> infoDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery().eq(PhoneRecordDO::getRechargeOrderId, orderDO.getId()));
-            Map<Long, List<PhoneRecordDO>> collect = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId));
-            rechargeGearRespVOS.forEach(vo -> {
-                List<PhoneRecordDO> infoDOS1 = collect.get(vo.getId());
-                if (!CollectionUtils.isEmpty(infoDOS1)) {
-                    vo.setIsExist("1");
-                } else {
-                    vo.setIsExist("0");
-                }
-            });
-        }
+        List<PhoneRecordDO> infoDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery().eq(PhoneRecordDO::getPhone, phone));
+        Map<Long, List<PhoneRecordDO>> collect = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId));
+        rechargeGearRespVOS.forEach(vo -> {
+            List<PhoneRecordDO> infoDOS1 = collect.get(vo.getId());
+            if (!CollectionUtils.isEmpty(infoDOS1)) {
+                vo.setIsExist("1");
+            } else {
+                vo.setIsExist("0");
+            }
+        });
         return rechargeGearRespVOS;
     }
 

From 3c2eca8fba20b9a0c18d7a1d9b2a06998895112a Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Tue, 23 May 2023 11:26:48 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/recharge/RechargeOrderMapper.xml    | 1 +
 yudao-server/src/main/resources/application-prod.yaml         | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
index d4b6e789e..840d91eeb 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
@@ -33,6 +33,7 @@
         left join system_dept d on d.id = a.dept_id
         <include refid="baseWhere">
         </include>
+        order by a.pay_time desc
     </select>
     <select id="findListPage" resultType="cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeOrderRespVO">
         select
diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml
index 6d7f99628..7663c49b6 100644
--- a/yudao-server/src/main/resources/application-prod.yaml
+++ b/yudao-server/src/main/resources/application-prod.yaml
@@ -176,8 +176,8 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
       private-key-path: classpath:/1/apiclient_key.pem
       key-path: classpath:/1/apiclient_cert.p12
       cert-serial-no: 7F76A4ADC52CA0B440C4E5698F8A5CD1633A0FCD
-      notify-url: http://api.cyywl.top/app-api/pay/wxpay/pay_notify
-      refund-notify-url: http://api.cyywl.top/app-api/pay/wxpay/refund_notify
+      notify-url: http://api.cyywl.top/admin-api/notify/wxpay/pay_notify
+      refund-notify-url: http://api.cyywl.top/admin-api/notify/wxpay/refund_notify
     two:
       enabled: true
       app-id: wxb1826c88da21d81e