From f540029d2b1747bd7c1cb3c38d40987eec61e8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=90?= <419641032@qq.com> Date: Tue, 22 Sep 2020 09:59:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9F=AD=E4=BF=A1=E6=B3=A8?= =?UTF-8?q?=E5=86=8Cbug=EF=BC=8C=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zbkj/crmeb/sms/service/impl/SmsServiceImpl.java | 1 + .../zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/crmeb/src/main/java/com/zbkj/crmeb/sms/service/impl/SmsServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/sms/service/impl/SmsServiceImpl.java index 5c2d8c4b..06219a35 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/sms/service/impl/SmsServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/sms/service/impl/SmsServiceImpl.java @@ -155,6 +155,7 @@ public class SmsServiceImpl implements SmsService { // init(); registerRequest.setPassword(DigestUtils.md5Hex(registerRequest.getPassword())); Map map = CrmebUtil.objectToMap(registerRequest); + map.put("url", registerRequest.getDomain()); JSONObject post = post(SmsConstants.SMS_API_URL + SmsConstants.SMS_API_REGISTER_URI, map); //更新配置 setConfigSmsInfo(registerRequest.getAccount(), registerRequest.getPassword()); diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java index cc7e1926..04f08d0b 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java @@ -914,7 +914,8 @@ public class StoreOrderServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); if(null != storeOrder.getUnique()){ - lambdaQueryWrapper.eq(StoreOrder::getOrderId, storeOrder.getUnique()); + lambdaQueryWrapper.or().eq(StoreOrder::getOrderId, storeOrder.getUnique()) + .or().eq(StoreOrder::getUnique, storeOrder.getUnique()); } // if(null != storeOrder.getUid()){ lambdaQueryWrapper.eq(StoreOrder::getUid, storeOrder.getUid());