Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

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) {

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);

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);
 	}