Merge branch 'master' into qa

order-management/src/main/java/cn/freemud/management/adapter/OrderCancelReqAdapter.java

@@ -94,9 +94,10 @@ public class OrderCancelReqAdapter {
             payRefundItem.setPayChannelName(PayMethodEnum.getDescByCode(request.getPayMethodCode()));
         }
         payRefundItem.setAmount(request.getRefundAmount());
-        if (StringUtils.isNotBlank(request.getRefundTime())){
-            payRefundItem.setRefundTime(DateUtil.convert2Date(request.getRefundTime(), "yyyy-MM-dd HH:mm:ss").getTime());
-        }else {
+        if (StringUtils.isNotBlank(request.getRefundTime())) {
+            Date date = DateUtil.convert2Date(request.getRefundTime(), "yyyy-MM-dd HH:mm:ss");
+            payRefundItem.setRefundTime(date == null ? new Date().getTime() : date.getTime());
+        } else {
             payRefundItem.setRefundTime(new Date().getTime());
         }
         payRefundItem.setCardCode(PayMethodEnum.TSVC.getCode().equals(request.getPayMethodCode()) ? request.getUniqueCode() : null);