记得上下班打卡 | git大法好,push需谨慎

Commit 9f2204b2 authored by 胡佳晨's avatar 胡佳晨

修复订单回调

parent bae5de7b
...@@ -473,7 +473,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -473,7 +473,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
httpData.add("name", redisUtils.getStoreInfoVo(storeOrderVo.getStoreId()).getStoreName()); httpData.add("name", redisUtils.getStoreInfoVo(storeOrderVo.getStoreId()).getStoreName());
httpData.add("detail", "查找最初订单"); httpData.add("detail", "查找最初订单");
httpData.add("orderCode", storeOrderVo.getOrderCode()); httpData.add("orderCode", storeOrderVo.getOrderCode());
httpData.add("orderId", storeOrderVo.getOrderId()); // httpData.add("orderId", storeOrderVo.getOrderId());
httpData.add("clientIp", storeOrderVo.getIpAddress()); httpData.add("clientIp", storeOrderVo.getIpAddress());
httpData.add("notifyUrl", synUrl); httpData.add("notifyUrl", synUrl);
httpData.add("createDate", storeOrderVo.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); httpData.add("createDate", storeOrderVo.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
...@@ -520,7 +520,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -520,7 +520,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
log.debug("SYNC PARAM = " + syncOrderParam.toString()); log.debug("SYNC PARAM = " + syncOrderParam.toString());
//支付时间 //支付时间
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
String[] array = syncOrderParam.getOrderCodeId().split(","); String[] array = redisUtils.getMasterCode(syncOrderParam.getOrderCode());
String uid = "0"; String uid = "0";
BigDecimal priceActual = BigDecimal.ZERO; BigDecimal priceActual = BigDecimal.ZERO;
for (String orderId : array) { for (String orderId : array) {
......
...@@ -18,8 +18,8 @@ liquidnet: ...@@ -18,8 +18,8 @@ liquidnet:
username: admin username: admin
password: admin password: admin
config: config:
# location: /Users/hujiachen/IdeaProjects/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config location: /Users/hujiachen/JavaProject/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
location: /app/support-config # location: /app/support-config
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
spring: spring:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment