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());