xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 10:16:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!116 2022-1-26 Carl

Browse Source 
Merge pull request !116 from Admin/sit-Carl-V3
This commit is contained in:
Admin 2022-01-26 11:21:17 +00:00 committed by Gitee
commit 53d71fe478
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java
View File

@ -31,7 +31,7 @@ public class MemberService {
JSONObject json = JSONObject.parseObject(jsonObject.getString("data")); JSONObject json = JSONObject.parseObject(jsonObject.getString("data"));
String id = json.getString("id"); String id = json.getString("id");
jsonObject.put("xaccessToken", SmartJWTUtil.generateToken(id)); jsonObject.put("xaccessToken", SmartJWTUtil.generateToken(id));
jsonObject.put(" type","1"); jsonObject.put("type","1");
return jsonObject.toJSONString(); return jsonObject.toJSONString();
}else { }else {
return jsonObject.toJSONString(); return jsonObject.toJSONString();
@ -57,7 +57,7 @@ public class MemberService {
JSONObject json = JSONObject.parseObject(jsonObjectResult.getString("data")); JSONObject json = JSONObject.parseObject(jsonObjectResult.getString("data"));
String id = json.getString("id"); String id = json.getString("id");
jsonObjectResult.put("xaccessToken", SmartJWTUtil.generateToken(id)); jsonObjectResult.put("xaccessToken", SmartJWTUtil.generateToken(id));
jsonObject.put(" type","2"); jsonObject.put("type","2");
return jsonObjectResult.toJSONString(); return jsonObjectResult.toJSONString();
}else { }else {
return jsonObjectResult.toJSONString(); return jsonObjectResult.toJSONString();

9
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java
View File

@ -226,11 +226,14 @@ public class OrderService {
long elapsedTime = acceptTime - startTime; long elapsedTime = acceptTime - startTime;
JSONObject jsonObject = JSONObject.parseObject(result); JSONObject jsonObject = JSONObject.parseObject(result);
String afterDecodeResult = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY); String afterDecodeResult = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY);
OrderEntity orderEntity = ordersDao.findByOrderId(queryEntity.getOrderNumber());
//新增支付方式paytype
com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(afterDecodeResult); com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(afterDecodeResult);
JSONObject jsonObjectResult = (JSONObject)jsonArray.get(0); JSONObject jsonObjectResult = (JSONObject)jsonArray.get(0);
jsonObjectResult.put("paytype",orderEntity.getPayType()); if (queryEntity.getOrderNumber() != null &&queryEntity.getOrderNumber() != "") {
OrderEntity orderEntity = ordersDao.findByOrderId(queryEntity.getOrderNumber());
//新增支付方式paytype
jsonObjectResult.put("paytype",orderEntity.getPayType());
}
//记录服务响应时间 //记录服务响应时间
addOperatreFullData(url+"orderMaster/query",queryEntity.toString(),result, startTime,elapsedTime,acceptTime); addOperatreFullData(url+"orderMaster/query",queryEntity.toString(),result, startTime,elapsedTime,acceptTime);