From 01335276c71612e00c9eb69b22bb98e0fc913dfb Mon Sep 17 00:00:00 2001 From: liuyingfang <1357764963@qq.com> Date: Mon, 22 May 2023 16:34:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=8D=8F=E8=AE=AE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=EF=BC=8C=E5=BF=AB=E9=80=92=E9=B8=9F=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=B8=B8=E6=95=B0=EF=BC=8C=E6=AD=A3=E5=BC=8F=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E7=9B=B8=E5=85=B3=E5=8F=82=E6=95=B0=E6=94=B9=E5=8A=A8?= =?UTF-8?q?=EF=BC=8C=E5=BF=AB=E9=80=92=E9=B8=9F=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E8=8B=B9=E6=9E=9C=E7=9B=B8=E5=85=B3cid?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=94=B9=E5=8F=98=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=E6=94=B9=E4=B8=BA?= =?UTF-8?q?post=E8=AF=B7=E6=B1=82=EF=BC=8C=E5=BE=AE=E4=BF=A1=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/controller/PushController.java | 6 ++ .../controller/UserInfoController.java | 24 +++++++ .../store/MercOrderDetailController.java | 15 ++++ .../interceptor/TokenRegistryInterceptor.java | 1 + .../src/main/resources/application-dev.yml | 18 ++--- .../src/main/resources/application-prod.yml | 8 ++- .../platform/config/ParameterConfig.java | 10 +++ .../pluss/platform/util/MobV2PushUtilIOS.java | 2 +- .../pluss/platform/util/ParametersUtil.java | 6 ++ .../resources/config/application-common.yml | 10 ++- .../src/main/resources/application-dev.yml | 16 ++--- .../src/main/resources/application-prod.yml | 14 ++-- .../jsp/agreement/agreementBaseInfo.jsp | 3 +- .../pluss/platform/dto/MerChantOrderDTO.java | 1 + .../pluss/platform/entity/MerchantOrder.java | 2 + .../platform/enums/LogisticProvider.java | 5 +- .../device/MercOrderExpressService.java | 3 + .../impl/MercOrderExpressServiceImpl.java | 69 ++++++++++++++++++- .../deviceStock/DeviceStockService.java | 2 + .../impl/DeviceStockServiceImpl.java | 8 +++ .../impl/MerchantMenberServiceImpl.java | 7 +- .../ryx/pay/impl/RyxPayServiceimpl.java | 2 +- .../sxf/pay/impl/SxfPayServiceImpl.java | 2 +- .../platform/ys/pay/YsPayOldServiceImpl.java | 2 +- .../controller/home/WechantController.java | 13 ++-- .../src/main/resources/application-prod.yml | 2 +- 26 files changed, 210 insertions(+), 41 deletions(-) diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/PushController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/PushController.java index 3f8d4c5..648d034 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/PushController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/PushController.java @@ -75,6 +75,9 @@ public class PushController { String uid = userApp.getUserId().toString(); String cid = param.get("cid").toString(); + if (cid.isEmpty()){ + return ResultGenerator.genSuccessResult(); + } String deviceType = httpServletRequest.getHeader("type"); @@ -142,6 +145,9 @@ public class PushController { String uid = userApp.getUserId().toString(); String cid = param.get("cid").toString(); + if (cid.isEmpty()){ + return ResultGenerator.genSuccessResult(); + } String deviceType = httpServletRequest.getHeader("type"); String token = ""; diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java index ff5d5a8..640679a 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java @@ -229,6 +229,17 @@ public class UserInfoController { return ResultGenerator.genSuccessResult(); } + /** + * 新版登录 + * @param userInfo + * @return + */ + @PostMapping("/login") + public Result> detail(@RequestBody UserInfo userInfo) { + Map login = userInfoNewService.login(userInfo.getLoginName(), userInfo.getPassword()); + return ResultGenerator.genSuccessResult(login); + } + @GetMapping("/{loginName}/{password}") @ApiOperation(tags = {"页面-登录", "页面-切换商户"}, value = "登录", notes = "登录接口", httpMethod = "GET") @ApiImplicitParams({ @@ -265,6 +276,19 @@ public class UserInfoController { return ResultGenerator.genSuccessResult("保存安全密码成功", null); } + @PostMapping("/checkPayPassword") + public Result checkPayPassword(@RequestBody UserInfo userInfo){ + if (userInfo.getId() == null){ + return ResultGenerator.genFailResult("无ID"); + } + UserInfo payPassword = userInfoNewService.queryUserInfo(userInfo); + if (payPassword.getPayPassword() == null){ + return ResultGenerator.genSuccessResult("无支付密码","0"); + }else { + return ResultGenerator.genSuccessResult("ok","1"); + } + } + @PostMapping("/verifyPayPassword") public Result verifyPayPassword(@RequestBody Map param) { String payPassword = param.get("payPassword").toString(); diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercOrderDetailController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercOrderDetailController.java index 7022809..7004d8a 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercOrderDetailController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercOrderDetailController.java @@ -3,6 +3,7 @@ package cn.pluss.platform.controller.store; import cn.pluss.platform.api.Result; import cn.pluss.platform.api.ResultGenerator; import cn.pluss.platform.device.MercOrderDetailService; +import cn.pluss.platform.device.MercOrderExpressService; import cn.pluss.platform.dto.MercOrderDetailDTO; import cn.pluss.platform.entity.MercOrderDetail; import cn.pluss.platform.vo.MercOrderExpressVO; @@ -26,6 +27,8 @@ public class MercOrderDetailController { @Resource private MercOrderDetailService modService; + @Resource + private MercOrderExpressService mercOrderExpressService; /** * 订单分页查询接口 @@ -114,6 +117,18 @@ public class MercOrderDetailController { String msg = express == null ? "暂无物流信息" : "获取成功"; return ResultGenerator.genSuccessResult(msg,express); } + /** + * 查看物流信息（快递鸟） + */ + @GetMapping("/logistic") + public Result logistic(@RequestParam String expressNo)throws Exception{ + JSONObject expressInfo = mercOrderExpressService.getExpressInfo(expressNo); + if (expressInfo.isEmpty()){ + return ResultGenerator.genFailResult("无法查询快递信息"); + }else { + return ResultGenerator.genSuccessResult(expressInfo); + } + } /** * 申请退款 diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java b/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java index 328d42e..486e015 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java @@ -66,6 +66,7 @@ public class TokenRegistryInterceptor extends HandlerInterceptorAdapter { limitUri.add("/api/deviceGoods/deviceDetail/"); limitUri.add("/api/questionsAnswers"); limitUri.add("/api/helpVideo"); + limitUri.add("/api/systemConfig/updateSystemVersion"); boolean passFlag = limitUri.stream().anyMatch(s -> s.equals(requestUri) || requestUri.startsWith(s)); if (passFlag) { return true; diff --git a/pluss-api-page/src/main/resources/application-dev.yml b/pluss-api-page/src/main/resources/application-dev.yml index 0e5e3b3..f02b856 100644 --- a/pluss-api-page/src/main/resources/application-dev.yml +++ b/pluss-api-page/src/main/resources/application-dev.yml @@ -1,14 +1,14 @@ spring: - datasource: - url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 - username: root - password: CZGmysqlroot@123 - driver-class-name: com.mysql.jdbc.Driver # datasource: -# url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.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 +# url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 +# username: root +# password: CZGmysqlroot@123 +# driver-class-name: com.mysql.jdbc.Driver + datasource: + url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.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 parameter: ### 这个根据自己的情况配置 domain: https://ky.sxczgkj.cn diff --git a/pluss-api-page/src/main/resources/application-prod.yml b/pluss-api-page/src/main/resources/application-prod.yml index 4c3f665..62a9eda 100644 --- a/pluss-api-page/src/main/resources/application-prod.yml +++ b/pluss-api-page/src/main/resources/application-prod.yml @@ -1,10 +1,14 @@ spring: +# datasource: +# url: jdbc:mysql://rm-bp19ib8x213kh9t45.rwlb.rds.aliyuncs.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://rm-bp19ib8x213kh9t45.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.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 - parameter: ### 这个根据自己的情况配置 domain: https://ky.sxczgkj.cn diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/ParameterConfig.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/ParameterConfig.java index c465f0a..acbc64f 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/ParameterConfig.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/ParameterConfig.java @@ -276,6 +276,14 @@ public class ParameterConfig { @Value("${parameter.SJ_APPSECRET}") public String SJ_APPSECRET; + /** + * 快递相关（快递鸟） + */ + @Value("${express.USERID}") + public String USERID; + @Value("${express.APIKEY}") + public String APIKEY; + @PostConstruct public void init() { ParametersUtil.upload_save_path = upload_save_path; @@ -322,6 +330,8 @@ public class ParameterConfig { ParametersUtil.LESHUA_API=LESHUA_API; ParametersUtil.SJ_APPID = SJ_APPID; ParametersUtil.SJ_APPSECRET = SJ_APPSECRET; + ParametersUtil.USERID = USERID; + ParametersUtil.APIKEY = APIKEY; SxfConfg.init(sxfDomain, publicKey, orgId); diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilIOS.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilIOS.java index db24b12..a077c9b 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilIOS.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilIOS.java @@ -39,7 +39,7 @@ public class MobV2PushUtilIOS { public static final String appKey = "QwyHsKpc0I9BQMk9Xysx74"; public static final String appId = "yuBG87yWEt6SXrwBSSvjy1 "; - public static final String masterSecret = "QwyHsKpc0I9BQMk9Xysx74"; + public static final String masterSecret = "PpidsIbMSs7EQddDMHAh81"; public String getToken() throws IOException, NoSuchAlgorithmException { diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParametersUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParametersUtil.java index a027fc4..fb38126 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParametersUtil.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParametersUtil.java @@ -199,5 +199,11 @@ public class ParametersUtil { * @date: 2021/9/23 10:27 */ public static String SJ_APPSECRET; + + /** + * 快递相关（快递鸟） + */ + public static String USERID; + public static String APIKEY; } diff --git a/pluss-common-bundle/src/main/resources/config/application-common.yml b/pluss-common-bundle/src/main/resources/config/application-common.yml index 5fb988c..ae47450 100644 --- a/pluss-common-bundle/src/main/resources/config/application-common.yml +++ b/pluss-common-bundle/src/main/resources/config/application-common.yml @@ -103,7 +103,7 @@ parameter: APPLETS_APPID: wxc2bb94c0ddda1032 #小程序密钥 APPLETS_SECRET: 625cbce8772629312e42e8278a8d6889 - APPSECRET: 4e00bbf3fc75a1ff68ce866fd13f2bcc + APPSECRET: 8492a7e8d55bbb1b57f5c8276ea1add0 # b84ee0efaa0d9a649746ac65525f8e10 #IOS端公众号 APPID_IOS: wx212769170d2c6b2a @@ -156,3 +156,11 @@ sxf: getui: domain: https://restapi.getui.com/v2/${getui.appId} appId: jzSkfM0Wsk8uSDL2zwGu07 + +#快递（快递鸟） +express: + USERID: 1778214 + APIKEY: 63e75d64-e8fd-4dcc-93fa-17dc710cdf04 + + + diff --git a/pluss-manage-page/src/main/resources/application-dev.yml b/pluss-manage-page/src/main/resources/application-dev.yml index 6ddee97..190fdc5 100644 --- a/pluss-manage-page/src/main/resources/application-dev.yml +++ b/pluss-manage-page/src/main/resources/application-dev.yml @@ -1,16 +1,16 @@ spring: - datasource: - druid: - url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true - username: root - password: CZGmysqlroot@123 - driver-class-name: com.mysql.jdbc.Driver # datasource: # druid: -# url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 +# url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true # username: root -# password: prodCZGmysqlroot@123 +# password: CZGmysqlroot@123 # driver-class-name: com.mysql.jdbc.Driver + datasource: + druid: + url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.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 logging: config: classpath:log4j2-dev.xml diff --git a/pluss-manage-page/src/main/resources/application-prod.yml b/pluss-manage-page/src/main/resources/application-prod.yml index 44ee357..3e31c3d 100644 --- a/pluss-manage-page/src/main/resources/application-prod.yml +++ b/pluss-manage-page/src/main/resources/application-prod.yml @@ -1,10 +1,16 @@ spring: +# datasource: +# druid: +# url: jdbc:mysql://rm-bp19ib8x213kh9t45.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true +# username: root +# password: prodCZGmysqlroot@123 +# driver-class-name: com.mysql.jdbc.Driver datasource: druid: - url: jdbc:mysql://rm-bp19ib8x213kh9t45.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true - username: root - password: prodCZGmysqlroot@123 - driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.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 scheduling: enabled: true diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementBaseInfo.jsp index ba6387d..95a74fd 100644 --- a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementBaseInfo.jsp +++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementBaseInfo.jsp @@ -44,7 +44,8 @@ - + + diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerChantOrderDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerChantOrderDTO.java index c32c35f..d9427bf 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerChantOrderDTO.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerChantOrderDTO.java @@ -88,6 +88,7 @@ public class MerChantOrderDTO { private MerchantMemberCode mercMenberCode; + private String MercOrderNo; /** * 参数转换 diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrder.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrder.java index 603b0ce..2da10e1 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrder.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrder.java @@ -225,6 +225,8 @@ public class MerchantOrder { */ private BigDecimal mercFee; + private String thirdSendNo; + /** * 节约金额 */ diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/LogisticProvider.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/LogisticProvider.java index a7ab600..28e827c 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/LogisticProvider.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/LogisticProvider.java @@ -13,8 +13,9 @@ import lombok.Getter; @AllArgsConstructor public enum LogisticProvider { - YTO("YTO","圆通快递"); - + YTO("YTO","圆通快递"), + STO("STO", "申通快递"), + HTKY("HTKY", "百世快递"); private String code; private String desc; diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderExpressService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderExpressService.java index f575bc8..30fd91c 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderExpressService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderExpressService.java @@ -1,6 +1,7 @@ package cn.pluss.platform.device; import cn.pluss.platform.entity.MercOrderExpress; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; public interface MercOrderExpressService extends IService { @@ -8,4 +9,6 @@ public interface MercOrderExpressService extends IService { MercOrderExpress getByLogistNo(String logistNo); MercOrderExpress getByExpressNo(String expressNo); + + JSONObject getExpressInfo(String expressNo) throws Exception; } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderExpressServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderExpressServiceImpl.java index b016b0b..5681b03 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderExpressServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderExpressServiceImpl.java @@ -2,14 +2,26 @@ package cn.pluss.platform.device.impl; import cn.pluss.platform.device.MercOrderExpressService; import cn.pluss.platform.entity.MercOrderExpress; +import cn.pluss.platform.enums.LogisticProvider; +import cn.pluss.platform.exception.MsgException; import cn.pluss.platform.mapper.MercOrderExpressMapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.pluss.platform.util.*; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.HashMap; +import java.util.Map; + +@Slf4j @Service public class MercOrderExpressServiceImpl extends ServiceImpl implements MercOrderExpressService { - + public static final String CHECK_Express = "https://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx"; /** * 根据上送物流单号查询商户单号 * @param logistNo @@ -24,4 +36,57 @@ public class MercOrderExpressServiceImpl extends ServiceImpl",jsonObject.get("Reason")); + throw new MsgException("快递查询失败"); + } + return jsonObject; + + } + public JSONObject reqJsonData(JSONObject requestData)throws Exception{ + + Map hashMap = new HashMap<>(16); + hashMap.put("RequestData", requestData); + hashMap.put("EBusinessID", ParametersUtil.USERID); + hashMap.put("RequestType", "1002"); + hashMap.put("DataSign", dataSign(requestData)); + hashMap.put("DataType", "2"); + + HttpResult httpResult = HttpUtil.doPost(CHECK_Express, hashMap); + JSONObject jsonObject = JSON.parseObject(httpResult.getBody()); + return jsonObject; + } + private String dataSign(JSONObject requestData)throws Exception{ + String sign = requestData.toString()+ParametersUtil.APIKEY; + //首先再进行MD5 + String lowerMD5 = MD5Util.md5(sign).toLowerCase(); + //然后再进行Base64 + final byte[] lowerMD5Bytes = lowerMD5.getBytes(StandardCharsets.UTF_8); + String base64= Base64.getEncoder().encodeToString(lowerMD5Bytes); + //再进行base64URL编码 + return URLEncoder.encode(base64, "UTF-8"); + } + + } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/DeviceStockService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/DeviceStockService.java index 3ced31b..d235178 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/DeviceStockService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/DeviceStockService.java @@ -101,4 +101,6 @@ public interface DeviceStockService extends IService { void bindDevcieV2(DeviceStockDTO dto); DeviceStock checkBind(String sn); + + DeviceStock getDeviceBySnNo(String sn); } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java index d2b4875..95e0b44 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java @@ -399,6 +399,14 @@ public class DeviceStockServiceImpl extends ServiceImpl> E page(E page, Wrapper queryWrapper) { DeviceStock deviceStock = queryWrapper.getEntity(); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java index 25e006a..66f79f5 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java @@ -7,6 +7,7 @@ import cn.pluss.platform.entity.*; import cn.pluss.platform.exception.MsgException; import cn.pluss.platform.mapper.MerchantMenberMapper; import cn.pluss.platform.mapper.PhoneValidateCodeMapper; +import cn.pluss.platform.merchant.MerchantBaseInfoService; import cn.pluss.platform.merchantMenber.MerchantMenberService; import cn.pluss.platform.merchantStore.MerchantStoreService; import cn.pluss.platform.userApp.UserAppService; @@ -51,6 +52,8 @@ public class MerchantMenberServiceImpl extends ServiceImpl