From f21705b769dd9fa6c4db52a04b59cce5705b0b66 Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Mon, 15 Jul 2024 16:54:44 +0800 Subject: [PATCH] 1 --- .../controller/cms/CmsContentController.java | 6 ++- .../com/cweb/controller/CommonController.java | 1 + .../controller/cms/CmsContentController.java | 6 ++- .../controller/qianZhu/CinemaController.java | 10 +++-- cweb/src/main/resources/prod/logback.xml | 23 ++++++++++ order/src/main/resources/prod/logback.xml | 43 +++++++++++++++++++ .../com/hfkj/common/security/UserCenter.java | 2 +- .../cms/impl/CmsContentServiceImpl.java | 6 +++ .../hfkj/service/impl/CommonServiceImpl.java | 2 +- .../hfkj/service/pay/huift/TradeService.java | 2 +- .../resources/prod/commonConfig.properties | 6 +-- 11 files changed, 94 insertions(+), 13 deletions(-) diff --git a/bweb/src/main/java/com/bweb/controller/cms/CmsContentController.java b/bweb/src/main/java/com/bweb/controller/cms/CmsContentController.java index ef76c67..f76e04c 100644 --- a/bweb/src/main/java/com/bweb/controller/cms/CmsContentController.java +++ b/bweb/src/main/java/com/bweb/controller/cms/CmsContentController.java @@ -27,14 +27,16 @@ public class CmsContentController { @Resource private CmsContentService cmsContentService; - @RequestMapping(value="/getListBrand",method = RequestMethod.GET) + @RequestMapping(value="/getCms",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询列表") - public ResponseData getListBrand(@RequestParam(value = "code" , required = false) String code) { + public ResponseData getCms(@RequestParam(value = "code" , required = false) String code, + @RequestParam(value = "platformCode" , required = false) String platformCode) { try { Map map = new HashMap<>(); map.put("code", code); + map.put("platformCode", platformCode); return ResponseMsgUtil.success(cmsContentService.getList(map)); diff --git a/cweb/src/main/java/com/cweb/controller/CommonController.java b/cweb/src/main/java/com/cweb/controller/CommonController.java index 249db42..c1c8dea 100644 --- a/cweb/src/main/java/com/cweb/controller/CommonController.java +++ b/cweb/src/main/java/com/cweb/controller/CommonController.java @@ -133,6 +133,7 @@ public class CommonController { JSONObject params = commonService.locateByLngAndLat(lng + "," + lat); + System.out.println(params); if (params.getInteger("status") == 0) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未查询到任何城市！"); diff --git a/cweb/src/main/java/com/cweb/controller/cms/CmsContentController.java b/cweb/src/main/java/com/cweb/controller/cms/CmsContentController.java index 4123cf3..28e6fd6 100644 --- a/cweb/src/main/java/com/cweb/controller/cms/CmsContentController.java +++ b/cweb/src/main/java/com/cweb/controller/cms/CmsContentController.java @@ -27,14 +27,16 @@ public class CmsContentController { @Resource private CmsContentService cmsContentService; - @RequestMapping(value="/getListBrand",method = RequestMethod.GET) + @RequestMapping(value="/getCms",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询列表") - public ResponseData getListBrand(@RequestParam(value = "code" , required = false) String code) { + public ResponseData getCms(@RequestParam(value = "code" , required = false) String code, + @RequestParam(value = "platformCode" , required = false) String platformCode) { try { Map map = new HashMap<>(); map.put("code", code); + map.put("platformCode", platformCode); return ResponseMsgUtil.success(cmsContentService.getList(map)); diff --git a/cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java b/cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java index 919e598..46df46f 100644 --- a/cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java +++ b/cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java @@ -326,16 +326,20 @@ public class CinemaController { } if (areaPrices != null) { - for (Object price: areaPrices) { - JSONObject priceObject = (JSONObject) price; + + String[] areaName = new String[]{"特价" , "优选" , "最佳"}; + + for (int i = 0; i < areaPrices.size(); i++) { + JSONObject priceObject = (JSONObject) areaPrices.get(i); BigDecimal salePrice = priceObject.getBigDecimal("price").add(priceObject.getBigDecimal("qmmPrice").multiply(productConfig.getDiscount()).divide(new BigDecimal(100) , 2, RoundingMode.HALF_UP)); if (salePrice.compareTo(priceObject.getBigDecimal("price")) > 0) { priceObject.put("salePrice" , salePrice); } else { priceObject.put("salePrice" , priceObject.getBigDecimal("price")); } - + priceObject.put("areaName" , areaName[i]); } + } object.put("seats" , jsonArray); diff --git a/cweb/src/main/resources/prod/logback.xml b/cweb/src/main/resources/prod/logback.xml index e509de0..dd3c64b 100644 --- a/cweb/src/main/resources/prod/logback.xml +++ b/cweb/src/main/resources/prod/logback.xml @@ -69,4 +69,27 @@ + + + + + log/QianZhuLog.log + + log/QianZhuLog/QianZhuLog.log.%d.%i + + + 64 MB + + + + + %d %p (%file:%line\)- %m%n + + UTF-8 + + + + + + diff --git a/order/src/main/resources/prod/logback.xml b/order/src/main/resources/prod/logback.xml index 8b9d603..814ac71 100644 --- a/order/src/main/resources/prod/logback.xml +++ b/order/src/main/resources/prod/logback.xml @@ -202,4 +202,47 @@ + + + log/QianZhuLog.log + + log/QianZhuLog/QianZhuLog.log.%d.%i + + + 64 MB + + + + + %d %p (%file:%line\)- %m%n + + UTF-8 + + + + + + + + + log/PhoneBillLog.log + + log/PhoneBillLog/PhoneBillLog.log.%d.%i + + + 64 MB + + + + + %d %p (%file:%line\)- %m%n + + UTF-8 + + + + + + + diff --git a/service/src/main/java/com/hfkj/common/security/UserCenter.java b/service/src/main/java/com/hfkj/common/security/UserCenter.java index 83e4fea..fa479d4 100644 --- a/service/src/main/java/com/hfkj/common/security/UserCenter.java +++ b/service/src/main/java/com/hfkj/common/security/UserCenter.java @@ -24,7 +24,7 @@ public class UserCenter { @Autowired private RedisUtil redisUtil; - private final int EXPIRE = 3600 * 24 * 3; // 登录过期时间为3天 + private final int EXPIRE = 3600 * 24 * 30; // 登录过期时间为30天 /** * 保存登录信息 diff --git a/service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java b/service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java index 0cb35af..2a133b5 100644 --- a/service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java @@ -52,6 +52,12 @@ public class CmsContentServiceImpl implements CmsContentService { if (StringUtils.isNotBlank(MapUtils.getString(map, "code"))) { criteria.andCodeEqualTo(MapUtils.getString(map, "code")); } + if (StringUtils.isNotBlank(MapUtils.getString(map, "platformCode"))) { + criteria.andPlatformCodeEqualTo(MapUtils.getString(map, "platformCode")); + }else { + criteria.andPlatformCodeEqualTo("H5"); + } + criteria.andStatusNotEqualTo(0); return cmsContentMapper.selectByExample(example); } } diff --git a/service/src/main/java/com/hfkj/service/impl/CommonServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/CommonServiceImpl.java index f0b331b..47008c5 100644 --- a/service/src/main/java/com/hfkj/service/impl/CommonServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/CommonServiceImpl.java @@ -84,7 +84,7 @@ public class CommonServiceImpl implements CommonService { public JSONObject locateByLngAndLat(String location) { Map map = new HashMap<>(); - map.put("key" , "b7f6a6c5cd9801a82a0dc827f271a75d"); + map.put("key" , "0083a5b1cc5289d7e9691424ee62136e"); map.put("location" , location); return HttpsUtils.doGet("https://restapi.amap.com/v3/geocode/regeo" , map); diff --git a/service/src/main/java/com/hfkj/service/pay/huift/TradeService.java b/service/src/main/java/com/hfkj/service/pay/huift/TradeService.java index aac4f68..7a42ea0 100644 --- a/service/src/main/java/com/hfkj/service/pay/huift/TradeService.java +++ b/service/src/main/java/com/hfkj/service/pay/huift/TradeService.java @@ -41,7 +41,7 @@ public class TradeService { param.put("shopCode", HuiftConfig.shopcode); param.put("outTradeNo", order.getOrderNo()); param.put("transAmt", order.getPayRealPrice().multiply(new BigDecimal("100")).intValue()); - param.put("callbackUrl", CommonSysConst.getSysConfig().getDomainName() + "/order/payNotify/huiftPay"); + param.put("callbackUrl", CommonSysConst.getSysConfig().getDomainName() + "/order/notify/huiftPay"); // param.put("remark", ""); // 备注 // param.put("outAppId", ""); param.put("outRedirectPath", CommonSysConst.getSysConfig().getDomainName()+"/cweb/#/order/order/orderList"); diff --git a/service/src/main/resources/prod/commonConfig.properties b/service/src/main/resources/prod/commonConfig.properties index 01fbe8c..f5f8ec9 100644 --- a/service/src/main/resources/prod/commonConfig.properties +++ b/service/src/main/resources/prod/commonConfig.properties @@ -52,10 +52,10 @@ etcPrivateKey = MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAO8+KWh/OmBahFk7 #QIANZHU -qinzhuUrl=https://live.qianzhu8.com +qianZhuUrl=https://live.qianzhu8.com qianzhuH5url=https://nf.qianzhu8.com/gateway -qinzhuPlatformId=10458 -qinzhuSecret=nnl3gg4ss0pka11t +qianZhuPlatformId=10710 +qianZhuSecret=pgmh5j1cbq2brm08 qianZhuCinemaNotify=https://phg.dctpay.com/order/cinemaNotify/notify #CT