Commit 80fcb196 authored by hezhen's avatar hezhen

Merge branch 'master_chw_publish' into dev-chw

parents 2f54e116 3d543d0e
...@@ -29,6 +29,7 @@ import java.time.format.DateTimeFormatter; ...@@ -29,6 +29,7 @@ import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE; import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER; import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
@Service @Service
...@@ -181,7 +182,7 @@ public class OrderPulishReceiveService extends AbstractOrderHandle<OrderPulishRe ...@@ -181,7 +182,7 @@ public class OrderPulishReceiveService extends AbstractOrderHandle<OrderPulishRe
BaseOrder baseOrder = baseOrderBiz.selectOne(new BaseOrder() {{ BaseOrder baseOrder = baseOrderBiz.selectOne(new BaseOrder() {{
setNo(receiveRefundDTO.getOrderNo()); setNo(receiveRefundDTO.getOrderNo());
}}); }});
if (baseOrder == null || !baseOrder.getHasPay().equals(SYS_FALSE)){ if (baseOrder == null || !baseOrder.getHasPay().equals(SYS_TRUE)){
throw new BaseException("该订单无法退款", ResultCode.FAILED_CODE); throw new BaseException("该订单无法退款", ResultCode.FAILED_CODE);
} }
String refundDesc = receiveRefundDTO.getRefundDesc(); String refundDesc = receiveRefundDTO.getRefundDesc();
......
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