czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

取消 首页菜单119版本IOS不显示发票以及线上店铺

Browse Source
This commit is contained in:
liuyingfang
2024-03-21 10:00:00 +08:00
parent 51a4abcde6
commit 52ee403187
5 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pluss-api-page/src/main/resources/application-dev.yml
View File

@@ -9,11 +9,13 @@ spring:
username: ysk_test
password: mysqlroot@123
driver-class-name: com.mysql.jdbc.Driver
# datasource:
# url: jdbc:mysql://101.37.12.135:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
# username: ysk_test
# password: CZGmysqlroot@123
# url: jdbc:mysql://101.37.12.135:3306/testchao?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
# username: testchao
# password: 2HzbCB3SHM2pWXWT
# driver-class-name: com.mysql.jdbc.Driver
parameter:
### 这个根据自己的情况配置
domain: https://admintestapi.sxczgkj.cn

7
pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankCodeSxfMapper.java
View File

@@ -1,8 +1,11 @@
package cn.pluss.platform.mapper;
import cn.pluss.platform.entity.BankCodeSxf;
import cn.pluss.platform.entity.BankCodeYs;
import cn.pluss.platform.leshua.BankNameVO;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import lombok.val;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -10,4 +13,8 @@ import java.util.List;
public interface BankCodeSxfMapper extends BaseMapper<BankCodeSxf> {
List<BankNameVO> getBranchName(@Param(value="areaCode")String areaCode, @Param(value="provinceCode")String provinceCode, @Param(value="bankName")String bankName, @Param(value="branchName")String branchName);
default BankCodeSxf selectByContactLine(String contactLine) {
val qWrapper = new LambdaQueryWrapper<BankCodeSxf>().eq(BankCodeSxf::getCnapsCode, contactLine);
return selectOne(qWrapper);
}
}

20
pluss-manage-page/src/main/resources/application-dev.yml
View File

@@ -12,16 +12,16 @@ spring:
# password: prodCZGmysqlroot@123
# driver-class-name: com.mysql.jdbc.Driver
# #新
datasource:
url: jdbc:mysql://rm-bp1uo9iq250st2e691o.mysql.rds.aliyuncs.com.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root
password: prodCZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver
# datasource:
# url: jdbc:mysql://101.37.12.135:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
# username: ysk_test
# password: CZGmysqlroot@123
# driver-class-name: com.mysql.jdbc.Driver
# datasource:
# url: jdbc:mysql://rm-bp1uo9iq250st2e691o.mysql.rds.aliyuncs.com.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
# username: root
# password: prodCZGmysqlroot@123
# driver-class-name: com.mysql.jdbc.Driver
datasource:
url: jdbc:mysql://101.37.12.135:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: ysk_test
password: mysqlroot@123
driver-class-name: com.mysql.jdbc.Driver
logging:
config: classpath:log4j2-dev.xml

2
pluss-model-bundle/src/main/java/cn/pluss/platform/enums/DeviceOperateType.java
View File

@@ -42,6 +42,6 @@ public enum DeviceOperateType {
return ot.getName();
}
}
return "";
return "virtual";
}
}

18
pluss-service-bundle/src/main/java/cn/pluss/platform/impl/AppMenuServiceImpl.java
View File

@@ -49,8 +49,8 @@ public class AppMenuServiceImpl extends ServiceImpl<AppMenuMapper, AppMenu> impl
@Override
public List<Map<String, Object>> getHomeMenu(HttpServletRequest request) {
// 1、安卓; 2、iOS
//int clientType = HttpUtils.isIOS(request)? 2: 1;
int clientType = HttpUtils.phoneType(request)?2:1;
int clientType = HttpUtils.isIOS(request)? 2: 1;
// int clientType = HttpUtils.phoneType(request)?2:1;
final String demoFlag = request.getHeader("demo");
List<Map<String, Object>> result = new ArrayList<>();
@@ -71,13 +71,13 @@ public class AppMenuServiceImpl extends ServiceImpl<AppMenuMapper, AppMenu> impl
Map<String, Object> map = null;
for (AppMenu appMenu : appMenuList) {
if (StringUtils.isNotBlank(version)){
if ("119".equals(version) && clientType==2){
if (appMenu.getId()==62 || appMenu.getId()==18){
break;
}
}
}
// if (StringUtils.isNotBlank(version)){
// if ("119".equals(version) && clientType==2){
// if (appMenu.getId()==62 || appMenu.getId()==18){
// break;
// }
// }
// }
AppMenu.wrapper(appMenu);
menuPathConvert(appMenu, request);
if (map == null || !map.get("type").equals(appMenu.getMenuGroupDesc())) {