From 7ee733c7b4f625749599b12c2fd564e7ae05ad31 Mon Sep 17 00:00:00 2001
From: yuanye <418471657@qq.com>
Date: Tue, 16 Nov 2021 16:09:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bweb/controller/HighOrderController.java     | 8 +++++++-
 .../java/com/hai/service/impl/BsCompanyServiceImpl.java   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java
index 43a7075c..b6305c4f 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java
@@ -182,7 +182,13 @@ public class HighOrderController {
                 map.put("companyId", companyId);
 
             } else if (userInfoModel.getSecUser().getObjectType() == 1) {
-                map.put("companyId", userInfoModel.getBsCompany().getId());
+
+                if (userInfoModel.getBsCompany().getId() == 3) {
+                    map.put("companyId", 23);
+                } else {
+                    map.put("companyId", userInfoModel.getBsCompany().getId());
+                }
+
                 map.put("merchantId", merchantId);
 
             } else if (userInfoModel.getSecUser().getObjectType() == 2) {
diff --git a/hai-service/src/main/java/com/hai/service/impl/BsCompanyServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/BsCompanyServiceImpl.java
index bd390b9d..6a2ed729 100644
--- a/hai-service/src/main/java/com/hai/service/impl/BsCompanyServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/BsCompanyServiceImpl.java
@@ -75,7 +75,7 @@ public class BsCompanyServiceImpl implements BsCompanyService {
 		bsOrganizationMapper.updateByPrimaryKey(secOrganization);
 		// 保存用户角色
 		SecUserRoleRel userRole = new SecUserRoleRel();
-		userRole.setUserId(secUser.getId());
+			userRole.setUserId(secUser.getId());
 		userRole.setRoleId(5L);
 		secUserRoleRelMapper.insert(userRole);
 	}

From b6c647fe79751f762017b1f44cc3debf513c52a0 Mon Sep 17 00:00:00 2001
From: yuanye <418471657@qq.com>
Date: Wed, 17 Nov 2021 09:09:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=BA=BF=E4=B8=8Abug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java
index 19f1e137..11a7406c 100644
--- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java
+++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java
@@ -96,8 +96,9 @@ public interface OutRechargeOrderMapperExt {
                    "<if test='map.createTimeE != null'> <![CDATA[ and a.create_timed <= #{map.createTimeE} ]]> </if>",
                    "<if test='map.payTimeS != null'> <![CDATA[ and a.pay_time >= #{map.payTimeS} ]]> </if>",
                    "<if test='map.payTimeE != null'> <![CDATA[ and a.pay_time <= #{map.payTimeE} ]]> </if>",
+                   " group by pay_time " +
                    " ORDER BY" +
-                   " a.create_timed DESC" +
+                   " a.create_timed DESC " +
                 "</script>"
     })
     List<OutRechargeOrderModel> selectOrderCount(@Param("map") Map<String,Object> map);