Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/detail.html

@@ -58,7 +58,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">会员卡ID：</label>
                 <div class="col-sm-8">
-                    <input name="memberNo" th:field="*{adamMemberOrderVo.memberId}" class="form-control" type="text" readonly>
+                    <input name="memberNo" th:field="*{adamUserMemberVo.memberNo}" class="form-control" type="text" readonly>
                 </div>
             </div>
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -196,39 +196,39 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 Integer orderExpressStatus = dataUtils.getOrderExpressInfo(orderTicketVo.getOrderTicketsId());
                 vo.setExpressStatus(orderExpressStatus);
 
-                if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
-                    LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
-                    LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
-                    if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) && orderTicketVo.getExpressAddress().trim().equals("") && ticketVo.getCounts()==1) {
-                        vo.setIsCanRefund(1);
-                    } else {
-                        vo.setIsCanRefund(0);
-                    }
-                } else {
-                    vo.setIsCanRefund(0);
-                }
-                currentTime = System.currentTimeMillis() - currentTime;
-                log.debug("是否支持退款 -> time:" + (currentTime) + "毫秒");
-
                 List<KylinOrderRefundsOrderCodeVo> orderRefundsVoBaseList = new ArrayList<>();
                 List<KylinOrderRefundsVo> orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderId);
                 currentTime = System.currentTimeMillis() - currentTime;
                 log.debug("获取退款详情 -> time:" + (currentTime) + "毫秒");
-                for (KylinOrderRefundsVo item : orderRefundsVoList) {
-                    KylinOrderRefundsOrderCodeVo data = new KylinOrderRefundsOrderCodeVo();
-                    data.setOrderRefundsId(item.getOrderRefundsId());
-                    data.setOrderRefundCode(item.getOrderRefundCode());
-                    data.setStatus(item.getStatus());
-                }
 
                 List<OrderRefundListVo> orderRefundListVos = new ArrayList<>();
+                BigDecimal lockPrice = new BigDecimal("0.00");
                 for (KylinOrderRefundsVo item : orderRefundsVoList) {
                     OrderRefundListVo data = new OrderRefundListVo();
                     data.setOrderRefundCode(item.getOrderRefundCode().substring(item.getOrderRefundCode().length() - 10));
                     data.setOrderRefundsId(item.getOrderRefundsId());
                     data.setStatus(item.getStatus());
+                    if (item.getStatus().equals(0) || item.getStatus().equals(1) || item.getStatus().equals(7) || item.getStatus().equals(3) || item.getStatus().equals(4)) {
+                        lockPrice = lockPrice.add(item.getPrice());
+                    }
                     orderRefundListVos.add(data);
                 }
+
+                if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
+                    LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
+                    LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
+                    if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) && orderTicketVo.getExpressAddress().trim().equals("")
+                            && ticketVo.getCounts() == 1 && lockPrice.compareTo(orderTicketVo.getPriceActual()) == 0) {
+                        vo.setIsCanRefund(1);
+                    } else {
+                        vo.setIsCanRefund(0);
+                    }
+                } else {
+                    vo.setIsCanRefund(0);
+                }
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("是否支持退款 -> time:" + (currentTime) + "毫秒");
+
                 currentTime = System.currentTimeMillis() - currentTime;
                 log.debug("循环退款详情 -> time:" + (currentTime) + "毫秒");
                 orderTicketVo.setOrderRefundListVos(orderRefundListVos);
@@ -361,7 +361,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
                 LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
                 LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
-                if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) && orderTicketVo.getExpressAddress().trim().equals("") && ticketVo.getCounts()==1) {
+                if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) && orderTicketVo.getExpressAddress().trim().equals("") && ticketVo.getCounts() == 1) {
 
                 } else {
                     return "暂不支持退款";
@@ -381,7 +381,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             }
 
             BigDecimal refundSinglePrice = dataUtils.getCanRefundOrderEntitiesPrice(orderTicketVo, kylinOrderRefundsVoBaseList, orderTicketEntitiesId);
-            if (refundSinglePrice.compareTo(BigDecimal.ZERO)<=0) {
+            if (refundSinglePrice.compareTo(BigDecimal.ZERO) <= 0) {
                 return "申请金额不得小于0";
             }
             Map token = CurrentUtil.getTokenClaims();