From b8b80415cd3730ec4f8f50b81c66e0e05256c180 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 30 May 2024 09:51:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LoginContoller.java | 31 +++++++------------ .../cashierservice/service/LoginService.java | 2 +- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java index 463c43e..2911e96 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java @@ -101,26 +101,16 @@ public class LoginContoller { // @RequestParam(value = "rawData", required = false) String rawData, // @RequestParam(value = "signature", required = false) String signature ) { - - if (ObjectUtil.isNull(map) || ObjectUtil.isEmpty(map) || !map.containsKey("code") || ObjectUtil.isEmpty(map.get("code"))) { Result.fail("code不能为空"); } - String code = map.get("code").toString(); - -// String qrCode = map.get("qrCode"); - String rawData = map.get("rawData"); - String signature = map.get("signature"); - -// String encryptedData = map.get("encryptedData"); -// -// String ivStr = map.get("iv"); - - String phone = map.get("phone"); - + String encryptedData = map.get("encryptedData"); + String ivStr = map.get("iv"); +// String phone = map.get("phone"); + log.info("登录传参：入参：{}",JSONUtil.toJSONString(map)); // 用户非敏感信息：rawData // 签名：signature JSONObject rawDataJson = JSON.parseObject(rawData); @@ -136,12 +126,12 @@ public class LoginContoller { if (!signature.equals(signature2)) { return Result.fail("签名校验失败"); } - + String data = WxMaCryptUtils.decrypt(sessionKey, encryptedData, ivStr); + log.info("登录传参：解码获取手机号{}",data); + String phone =JSONObject.parseObject(data).get("phoneNumber").toString(); String nickName = rawDataJson.getString("nickName"); String avatarUrl = rawDataJson.getString("avatarUrl"); - try { -// return loginService.wxCustomLogin(openid, avatarUrl, nickName, phone, qrCode, IpUtil.getIpAddr(request)); return loginService.wxCustomLogin(openid, avatarUrl, nickName, phone, IpUtil.getIpAddr(request)); } catch (Exception e) { e.printStackTrace(); @@ -158,7 +148,7 @@ public class LoginContoller { * @param map * @return */ - @RequestMapping("getPhoneNumber") +// @RequestMapping("getPhoneNumber") public Result getPhoneNumber(@RequestBody Map map) { if (ObjectUtil.isNull(map) || ObjectUtil.isEmpty(map) || !map.containsKey("code") || ObjectUtil.isEmpty(map.get("code"))) { @@ -180,12 +170,13 @@ public class LoginContoller { String data = WxMaCryptUtils.decrypt(sessionKey, encryptedData, ivStr); try { if (ObjectUtil.isNotEmpty(data) && JSONObject.parseObject(data).containsKey("phoneNumber")) { + log.info("登录传参 获取手机号成功 sessionKey:{}\n encryptedData:{} \nivStr:{} \n data:{},",sessionKey,encryptedData,ivStr,JSONObject.parseObject(data).get("phoneNumber")); return Result.success(CodeEnum.SUCCESS, JSONObject.parseObject(data).get("phoneNumber")); } } catch (Exception e){ - + log.info("登录传参 获取手机号失败 sessionKey:{}\n encryptedData:{} \nivStr:{} \n data:{},",sessionKey,encryptedData,ivStr,data); } - return Result.fail("获取手机号失败"); + return Result.fail("获取手机号失败,请重试！"); } @Resource diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java index 9587fb4..1dae9dd 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java @@ -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(); From a5c416e3e6847c255f30ca3d1d77dbea9eb52268 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 30 May 2024 10:11:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/HomePageService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/HomePageService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/HomePageService.java index b62359e..3b4f539 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/HomePageService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/HomePageService.java @@ -56,10 +56,10 @@ public class HomePageService { //菜单 List 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); /** From 58ed73e6e051a741834a625e764b47af12267e08 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 30 May 2024 10:50:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=95=86=E5=93=81=E6=90=9C=E7=B4=A2=20?= =?UTF-8?q?=E9=99=84=E8=BF=91=E4=B8=80=E5=8D=83=E7=B1=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/dao/TbProductMapper.java | 4 ++-- .../system/cashierservice/entity/dto/HomeDto.java | 1 + .../system/cashierservice/service/ProductService.java | 7 +++++-- src/main/resources/mapper/TbProductMapper.xml | 6 ++++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductMapper.java index 46dfb73..9208a08 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductMapper.java @@ -23,12 +23,12 @@ public interface TbProductMapper { Integer selectByQcode(@Param("code") String code,@Param("productId") Integer productId,@Param("shopId") String shopId); Integer selectByNewQcode(@Param("code") String code,@Param("productId") Integer productId,@Param("shopId") String shopId,@Param("list") List list); - List selGroups(@Param("type") String type, + List selGroups(@Param("proName") String proName,@Param("type") String type, @Param("rightTopLng") Double rightTopLng, @Param("rightTopLat") Double rightTopLat, @Param("leftBottomLng") Double leftBottomLng, @Param("leftBottomLat") Double leftBottomLat, @Param("cities") String cities, @Param("orderBy") String orderBy, @Param("lng") String lng, @Param("lat") String lat); - List selHotGroups(@Param("type") String type, + List selHotGroups(@Param("proName") String proName,@Param("type") String type, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("cities") String cities, @Param("orderBy") String orderBy, @Param("lng") String lng, @Param("lat") String lat); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/HomeDto.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/HomeDto.java index db2a1cf..354fdc7 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/HomeDto.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/HomeDto.java @@ -7,6 +7,7 @@ import lombok.Data; */ @Data public class HomeDto extends HomeBaseDto { + private String proName; /** * 品类 */ diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java index 677a495..0aba788 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java @@ -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 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()); diff --git a/src/main/resources/mapper/TbProductMapper.xml b/src/main/resources/mapper/TbProductMapper.xml index b275b2c..9c2c15f 100644 --- a/src/main/resources/mapper/TbProductMapper.xml +++ b/src/main/resources/mapper/TbProductMapper.xml @@ -961,6 +961,9 @@ info.`status`='1' AND pro.is_combo = '1' AND info.cities = #{cities} + + AND pro.`name` LIKE concat('%',#{proName,jdbcType=VARCHAR},'%') + AND group_category_id LIKE concat('%',#{type,jdbcType=VARCHAR},'%') @@ -1005,6 +1008,9 @@ info.`status`='1' AND info.cities = #{cities} + + AND pro.`name` LIKE concat('%',#{proName,jdbcType=VARCHAR},'%') + AND pro.group_category_id LIKE concat('%',#{type,jdbcType=VARCHAR},'%')