jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复短信注册bug，订单详情查询bug

Browse Source
This commit is contained in:
张乐
2020-09-22 09:59:23 +08:00
parent 66dba46113
commit d5b1c049f9
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crmeb/src/main/java/com/zbkj/crmeb/sms/service/impl/SmsServiceImpl.java
View File

@@ -155,6 +155,7 @@ public class SmsServiceImpl implements SmsService {
// init(); // init();
registerRequest.setPassword(DigestUtils.md5Hex(registerRequest.getPassword())); registerRequest.setPassword(DigestUtils.md5Hex(registerRequest.getPassword()));
Map<String, Object> map = CrmebUtil.objectToMap(registerRequest); Map<String, Object> map = CrmebUtil.objectToMap(registerRequest);
map.put("url", registerRequest.getDomain());
JSONObject post = post(SmsConstants.SMS_API_URL + SmsConstants.SMS_API_REGISTER_URI, map); JSONObject post = post(SmsConstants.SMS_API_URL + SmsConstants.SMS_API_REGISTER_URI, map);
//更新配置 //更新配置
setConfigSmsInfo(registerRequest.getAccount(), registerRequest.getPassword()); setConfigSmsInfo(registerRequest.getAccount(), registerRequest.getPassword());

3
crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java
View File

@@ -914,7 +914,8 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
public StoreOrder getInfoJustOrderInfo(StoreOrder storeOrder) { public StoreOrder getInfoJustOrderInfo(StoreOrder storeOrder) {
LambdaQueryWrapper<StoreOrder> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<StoreOrder> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if(null != storeOrder.getUnique()){ 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()){ // if(null != storeOrder.getUid()){
lambdaQueryWrapper.eq(StoreOrder::getUid, storeOrder.getUid()); lambdaQueryWrapper.eq(StoreOrder::getUid, storeOrder.getUid());