czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lyf' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into lyf

Browse Source
This commit is contained in:
韩鹏辉
2024-05-30 11:19:54 +08:00
parent 0767efffcc 58ed73e6e0
commit 2e1755404e
7 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chaozhanggui/system/cashierservice/service/HomePageService.java
View File

@@ -56,10 +56,10 @@ public class HomePageService {
//菜单
List<SysDict> sysDicts = sysDictMapper.selectByType("home");
for (SysDict sysDict : sysDicts) {
if (sysDict.getIsChild().equals("1")) {
if (sysDict.getIsChild().equals(1)) {
sysDict.setDetail(sysDictMapper.selectByDictId(sysDict.getDictId()));
}
sysDict.setIsChild((sysDict.getIsChild() == null || sysDict.getIsChild().equals("0")) ? false : true);
sysDict.setIsChild((sysDict.getIsChild() == null || sysDict.getIsChild().equals(0)) ? false : true);
}
homeUpVO.setMenu(sysDicts);
/**

2
src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
View File

@@ -133,7 +133,7 @@ public class LoginService {
//展示描述
//图标
// map.put("", );
log.info("登录结果：" + JSONUtil.toJSONString(map));
log.info("登录传参 结果：" + JSONUtil.toJSONString(map));
return Result.success(CodeEnum.SUCCESS, map);
} catch (Exception e) {
e.printStackTrace();

7
src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
View File

@@ -186,6 +186,9 @@ public class ProductService {
homeDto.setPage(1);
homeDto.setSize(4);
}
if (homeDto.getType().equals("near")) {
homeDto.setDistanceInKm("1");
}
PageHelper.startPage(homeDto.getPage(), homeDto.getSize());
//经纬度(附近一km)
Map<String, double[]> topAndBottomMap = LocationUtils.returnLLSquarePoint(
@@ -202,12 +205,12 @@ public class ProductService {
stTime = enTime - 3600000L * 2;
}
shopGroupInfoVos = tbProductMapper.selHotGroups(
homeDto.getType(),
homeDto.getProName(),homeDto.getType(),
DateUtils.getStrTime(new Date(stTime)), DateUtils.getStrTime(new Date(enTime)),
homeDto.getAddress(), homeDto.getOrderBy().toString(), homeDto.getLng(), homeDto.getLat());
} else {
shopGroupInfoVos = tbProductMapper.selGroups(
homeDto.getType(),
homeDto.getProName(),homeDto.getType(),
topAndBottomMap.get("rightTopPoint")[1], topAndBottomMap.get("rightTopPoint")[0],
topAndBottomMap.get("leftBottomPoint")[1], topAndBottomMap.get("leftBottomPoint")[0],
homeDto.getAddress(), homeDto.getOrderBy().toString(), homeDto.getLng(), homeDto.getLat());