Merge branch 'dev' into test

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

@@ -112,38 +112,42 @@ public class KylinOrderRefundsVo implements Serializable {
     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;
+        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){
+            this.statusName = "其他";
         }
     }
 

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

 package com.liquidnet.service.kylin.controller;
 
 
+import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo;
@@ -157,7 +158,7 @@ public class KylinPerformancesController {
         if (result != null) {
             return ResponseDto.success(result);
         } else {
-            return ResponseDto.failure("444", "获取演出详情失败");
+            return ResponseDto.failure(ErrorMapping.get("20700"));
         }
     }
 
@@ -171,7 +172,7 @@ public class KylinPerformancesController {
         if (result != null) {
             return ResponseDto.success(result);
         } else {
-            return ResponseDto.failure("获取演出详情失败");
+            return ResponseDto.failure(ErrorMapping.get("20701"));
         }
     }
 
@@ -189,7 +190,7 @@ public class KylinPerformancesController {
         if (result.size() > 0) {
             return ResponseDto.success(result);
         } else {
-            return ResponseDto.failure("获取演出场次票种失败");
+            return ResponseDto.failure(ErrorMapping.get("20702"));
         }
     }
 
@@ -207,7 +208,7 @@ public class KylinPerformancesController {
         if (result != null) {
             return ResponseDto.success(result);
         } else {
-            return ResponseDto.failure("获取演出详情失败");
+            return ResponseDto.failure(ErrorMapping.get("20703"));
         }
     }
 

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
\ No newline at end of file
+      connection-timeout: 5000

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/errors.properties

@@ -70,3 +70,9 @@
 20606=当前账号无关联演出数据
 20607=当前账号未关联当前演出
 20608=当前演出还未开放下载
+
+# 演出
+20700=演出详情获取失败
+20701=巡演获取失败
+20702=获取演出场次票种失败
+20703=获取支付前详情失败

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/OrderRefundsCallbackServiceImpl.java

@@ -80,14 +80,14 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
             kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
             kylinOrderRefundsMapper.update(
                     kylinOrderRefunds,
-                    new UpdateWrapper<KylinOrderRefunds>().eq("order_refund_code", refundCallbackParam.getOrder_refund_code())
+                    new UpdateWrapper<KylinOrderRefunds>().eq("order_refunds_id", refundInfo.getOrderRefundsId())
             );
             // 修改缓存
             KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
             BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
             BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderRefundsVo)));
             UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
-                    Query.query(Criteria.where("orderRefundCode").is(refundCallbackParam.getOrder_refund_code())).getQueryObject(),
+                    Query.query(Criteria.where("orderRefundsId").is(refundInfo.getOrderRefundsId())).getQueryObject(),
                     object
             );
         }