Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
commit
ca79db833d
|
@ -146,6 +146,8 @@ public class WxPayNotifyController {
|
|||
rechargeOrderMapper.updateById(orderDO);
|
||||
//删除提报记录
|
||||
phoneRecordService.deletePhoneGear(orderDO.getOrderId());
|
||||
//删除本地提报记录
|
||||
phoneRecordService.deletePhoneRecord(orderDO.getId());
|
||||
// 修改订单状态
|
||||
// 写入
|
||||
response.setStatus(HttpServletResponse.SC_OK);
|
||||
|
|
|
@ -1226,7 +1226,8 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
|
|||
}catch (Exception e) {
|
||||
log.error("删除提报记录异常{}",e);
|
||||
}
|
||||
|
||||
//删除本地提报记录
|
||||
phoneRecordService.deletePhoneRecord(orderDO.getId());
|
||||
// 表示退款
|
||||
} else {
|
||||
// 表示支付
|
||||
|
|
Loading…
Reference in New Issue