1.库存预警提示语修改
2.库存预警30分钟内只推送一次 3.点歌支付成功同步保存平台订单号
This commit is contained in:
@@ -55,15 +55,9 @@ public class NotifyController {
|
||||
JSONObject object=JSONUtil.parseObj(map.get("bizData").toString());
|
||||
if(ObjectUtil.isNotEmpty(object)&&object.containsKey("state")){
|
||||
if("TRADE_SUCCESS".equals(object.get("state").toString())){
|
||||
JSONObject extParam = object.getJSONObject("extParam");
|
||||
String orderNo=object.get("mchOrderNo").toString();
|
||||
if (ObjectUtil.isNotEmpty(extParam)&&ObjectUtil.isNotNull(extParam)&&PayTypeConstant.MINI_PAY.equals(extParam.getStr("payType"))) {
|
||||
log.info("接收到微信点歌支付成功回调,订单编号:{}", orderNo);
|
||||
return payService.songPaySuccess(orderNo, extParam.getStr("orderNo"));
|
||||
}else {
|
||||
String tradeNo=object.get("payOrderId").toString();
|
||||
return payService.fstMemberInSuccess(orderNo,tradeNo);
|
||||
}
|
||||
String tradeNo=object.get("payOrderId").toString();
|
||||
return payService.fstMemberInSuccess(orderNo,tradeNo);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -159,8 +153,9 @@ public class NotifyController {
|
||||
if (ObjectUtil.isNotEmpty(map) && map.containsKey("code") && "000000".equals(map.get("code") + "")) {
|
||||
JSONObject object = JSONUtil.parseObj(map.get("bizData"));
|
||||
if (ObjectUtil.isNotEmpty(object) && object.containsKey("state") && "TRADE_SUCCESS".equals(object.getStr("state"))) {
|
||||
String tradeNo=object.get("payOrderId").toString();
|
||||
String orderNo = object.getStr("mchOrderNo");
|
||||
return payService.songOrderSuccess(orderNo, DateUtils.getTime(new Date()));
|
||||
return payService.songOrderSuccess(orderNo, tradeNo);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
|
||||
Reference in New Issue
Block a user