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

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundsVo.java

@@ -111,39 +111,44 @@ public class KylinOrderRefundsVo implements Serializable {
     private List<KylinOrderRefundEntitiesVo> orderRefundEntitiesVoList;
     private List<KylinOrderRefundPicVo> orderRefundPicVos;
 
-    public void setStatusName(Integer status){
-        this.status=status;
-        switch (status){
-            case 0:
-                this.statusName="请求退款";
-                break;
-            case 1:
-                this.statusName="一审通过";
-                break;
-            case 2:
-                this.statusName="取消退款";
-                break;
-            case 3:
-                this.statusName="正在退款";
-                break;
-            case 4:
-                this.statusName="完成退款";
-                break;
-            case 5:
-                this.statusName="一审驳回退款";
-                break;
-            case 6:
-                this.statusName="退款失败";
-                break;
-            case 7:
-                this.statusName="二审通过等待退款";
-                break;
-            case 8:
-                this.statusName="二审驳回退款";
-                break;
-            default:
-                this.statusName="其他";
-                break;
+    public void setStatus(Integer status){
+        try {
+            this.status = status;
+            switch (status) {
+                case 0:
+                    this.statusName = "请求退款";
+                    break;
+                case 1:
+                    this.statusName = "一审通过";
+                    break;
+                case 2:
+                    this.statusName = "取消退款";
+                    break;
+                case 3:
+                    this.statusName = "正在退款";
+                    break;
+                case 4:
+                    this.statusName = "完成退款";
+                    break;
+                case 5:
+                    this.statusName = "一审驳回退款";
+                    break;
+                case 6:
+                    this.statusName = "退款失败";
+                    break;
+                case 7:
+                    this.statusName = "二审通过等待退款";
+                    break;
+                case 8:
+                    this.statusName = "二审驳回退款";
+                    break;
+                default:
+                    this.statusName = "其他";
+                    break;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            this.statusName = "其他";
         }
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java

@@ -365,7 +365,6 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         }
 
         KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
-        kylinOrderRefundsVo.setStatusName(data.getStatus());
         kylinOrderRefundsVo.setEntities(entities);
         BeanUtils.copyProperties(data, kylinOrderRefundsVo);
 

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

@@ -354,12 +354,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             orderTickets.setPriceTotal(ticketData.getPrice().multiply(new BigDecimal(payOrderParam.getNumber())).add(payOrderParam.getIsExpress() == 1 ? ticketData.getPriceExpress() : new BigDecimal("0")));
         }
 
-        /*if (Arrays.asList("dev", "test").contains(environment.getProperty("spring.profiles.active"))) {
-            orderTickets.setPriceActual(new BigDecimal("0.01"));
-        } else {*/
         orderTickets.setPriceActual(orderTickets.getPriceTotal());
-        /*}*/
-
         orderTickets.setPriceVoucher(new BigDecimal("0.0"));
         orderTickets.setPriceExpress(ticketData.getPriceExpress());
         orderTickets.setPriceRefund(new BigDecimal(0.0));
@@ -529,11 +524,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 
         LinkedMultiValueMap<String, String> httpData = new LinkedMultiValueMap<String, String>();
         httpData.add("type", "TICKET");
-        /*if (Arrays.asList("dev", "test").contains(environment.getProperty("spring.profiles.active"))) {
-            httpData.add("price", "0.01");
-        } else {*/
         httpData.add("price", orderTickets.getPriceActual().toString());
-//        }
         httpData.add("name", useTime + ticketData.getTitle() + "-" + performanceData.getTitle());
         httpData.add("detail", performanceData.getTitle() + "-" + ticketData.getTitle() + "-" + useTime);
         httpData.add("order_code", orderTickets.getOrderCode());
@@ -666,11 +657,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 
                 LinkedMultiValueMap<String, String> httpData = new LinkedMultiValueMap<String, String>();
                 httpData.add("type", "TICKET");
-                if (Arrays.asList("dev", "test").contains(environment.getProperty("spring.profiles.active"))) {
-                    httpData.add("price", orderTicketData.getPriceActual().toString());
-                } else {
-                    httpData.add("price", "0.01");
-                }
+                httpData.add("price", orderTicketData.getPriceActual().toString());
                 httpData.add("name", entitiesData.getUseStart() + "" + entitiesData.getPerformanceTitle());
                 httpData.add("detail", entitiesData.getPerformanceTitle() + "-" + entitiesData.getTicketTitle() + "-" + entitiesData.getUseStart());
                 httpData.add("order_code", orderTicketData.getOrderCode());
@@ -983,7 +970,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 orderTicketVo.setNotice(performanceVo.getNotice());
                 orderTicketVo.setTicketType(ticketVo.getType());
                 orderTicketVo.setFieldName(performanceVo.getFieldName());
-                if (ticketVo.getIsShowCode() == 1 && orderTicketVo.getStatus()!=0 && orderTicketVo.getStatus()!=2 && orderTicketVo.getStatus()!=4 ) {
+                if (ticketVo.getIsShowCode() == 1 && orderTicketVo.getStatus() != 0 && orderTicketVo.getStatus() != 2 && orderTicketVo.getStatus() != 4) {
                     LocalDateTime date = DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketVo.getQrCodeShowTime());
                     if (LocalDateTime.now().isAfter(date)) {
                         orderTicketVo.setQrCode(orderTicketVo.getQrCode());
@@ -1029,7 +1016,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());
+                    LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
                     if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)) {
                         vo.setIsCanRefund(1);
                     } else {
@@ -1049,15 +1036,15 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 
                 List<KylinOrderRefundsVo> orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderId);
                 List<OrderRefundListVo> orderRefundListVos = new ArrayList<>();
-                for (KylinOrderRefundsVo item : orderRefundsVoList){
+                for (KylinOrderRefundsVo item : orderRefundsVoList) {
                     OrderRefundListVo data = new OrderRefundListVo();
-                    data.setOrderRefundCode(item.getOrderRefundCode().substring(item.getOrderRefundCode().length()-10));
+                    data.setOrderRefundCode(item.getOrderRefundCode().substring(item.getOrderRefundCode().length() - 10));
                     data.setOrderRefundsId(item.getOrderRefundsId());
                     data.setStatus(item.getStatus());
                     orderRefundListVos.add(data);
                 }
                 orderTicketVo.setOrderRefundListVos(orderRefundListVos);
-                orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length()-10));
+                orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
                 vo.setOrderRefundsVoList(orderRefundsVoBaseList);
                 vo.setOrderTicketVo(orderTicketVo);
                 vo.setEnterDescribe(dataUtils.getEnterInfo("1"));
@@ -1138,16 +1125,16 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 }
                 item.setPriceActual(orderTicketVo.getPriceActual().subtract(orderTicketVo.getPriceExpress()).divide(new BigDecimal(orderTicketVo.getNumber())));
                 item.setPriceCanRefund(dataUtils.getCanRefundOrderEntitiesPrice(orderTicketVo, kylinOrderRefundsVoBaseList, item.getOrderTicketEntitiesId()));
-                BeanUtils.copyProperties(item,refundVo);
+                BeanUtils.copyProperties(item, refundVo);
                 kylinOrderTicketEntitiesPreRefundVos.add(refundVo);
             }
             orderTicketVo.setFieldName(performanceVo.getFieldName());
 
-            BeanUtils.copyProperties(orderTicketVo,vo);
+            BeanUtils.copyProperties(orderTicketVo, vo);
             vo.setIsTrueName(performanceVo.getIsTrueName());
             vo.setEntitiesPreRefundVos(kylinOrderTicketEntitiesPreRefundVos);
             return vo;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
@@ -1193,13 +1180,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             }
 
             BigDecimal refundSinglePrice = dataUtils.getCanRefundOrderEntitiesPrice(orderTicketVo, kylinOrderRefundsVoBaseList, orderTicketEntitiesId);
-            if(refundSinglePrice.doubleValue()<=0){
+            if (refundSinglePrice.doubleValue() <= 0) {
                 return ResponseDto.failure(ErrorMapping.get("20022"));
             }
             Map token = CurrentUtil.getTokenClaims();
             String username = StringUtils.defaultString(((String) token.get("nickname")), "");
             String result = refundsStatusService.userOrderTicketRefunding(orderTicketVo, refundSinglePrice.doubleValue(), orderTicketEntitiesId, reason, picList, uid, username, kylinOrderRefundsVoBaseList.size());
-            if (result!="") {
+            if (result != "") {
                 return ResponseDto.success(result);
             } else {
                 return ResponseDto.failure(ErrorMapping.get("20019"));
@@ -1222,7 +1209,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         String strTime = DateUtil.Formatter.yyyyMMddHHmmss.format(time);
         try {
             KylinOrderRefundsVo orderRefundsVo = dataUtils.getOrderRefundVo(orderRefundsId);
-            if(!orderRefundsVo.getStatus().equals(0)){
+            if (!orderRefundsVo.getStatus().equals(0)) {
                 return ResponseDto.failure(ErrorMapping.get("20020"));
             }
             List<KylinOrderRefundEntitiesVo> refundEntities = orderRefundsVo.getOrderRefundEntitiesVoList();

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap-test.yml

@@ -11,4 +11,4 @@ liquidnet:
 
 spring:
   profiles:
-    include: service-kylin
+    include: service-kylin
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap.yml

@@ -8,4 +8,4 @@ spring:
       max-threads: 2000
       min-spare-threads: 200
       max-connections: 20000
-      connection-timeout: 5000
+      connection-timeout: 5000
\ No newline at end of file

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-test.yml

@@ -23,4 +23,4 @@ liquidnet:
 
 spring:
   profiles:
-    include: support-config
+    include: support-config
\ No newline at end of file