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

Commit d1f58e82 authored by 胡佳晨's avatar 胡佳晨

Merge branch 'master' into dev_performance_paytxt

parents b9ed0433 c4542306
......@@ -121,7 +121,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
decrSkuCountByUid(orderVo.getUserId(), skuVo.getSkuId(), skuVo.getNum());
//mysql
sqlDataSku.add(new Object[]{
skuVo.getStatus(), now, orderVo.getOrderId(), now, now
skuVo.getStatus(), now, skuVo.getOrderSkuId(), now, now
});
}
//订单
......@@ -264,7 +264,6 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
param.setUid(uid);
MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
header.add("Authorization", "Bearer " + CurrentUtil.getToken());
header.add("Accept", "application/json;charset=UTF-8");
ArrayList<com.liquidnet.service.candy.param.BackCouponParam> params = new ArrayList();
params.add(param);
......
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