Merge branch 'pre' into 'master'

Pre

See merge request !59

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/PlatformTaskHandler.java

@@ -29,7 +29,7 @@ public class PlatformTaskHandler {
             String result = feignPlatformAlipayBackClient.alipayActiveCallback().getData();
             log.info("alipayActiveCallback：结果："+result);
             ReturnT<String> success = ReturnT.SUCCESS;
-            success.setContent(result);
+            success.setMsg(result);
             return success;
         } catch (Exception e) {
             log.error("exception of handler:{}", e.getMessage(), e);
@@ -46,7 +46,9 @@ public class PlatformTaskHandler {
             ResponseDto<String> dto = feignPlatformCandyTaskClient.mgtIssueCoupons();
             String dtoStr = JsonUtils.toJson(dto);
             log.info("result of handler:{}", dtoStr);
-            return new ReturnT<>(dtoStr);
+            ReturnT<String> success = ReturnT.SUCCESS;
+            success.setMsg(dtoStr);
+            return success;
         } catch (Exception e) {
             log.error("exception of handler:{}", e.getMessage(), e);
             ReturnT<String> fail = ReturnT.FAIL;
@@ -62,7 +64,9 @@ public class PlatformTaskHandler {
             ResponseDto<String> dto = feignPlatformCandyTaskClient.dueProcessForRedeem();
             String dtoStr = JsonUtils.toJson(dto);
             log.info("result of handler:{}", dtoStr);
-            return new ReturnT<>(dtoStr);
+            ReturnT<String> success = ReturnT.SUCCESS;
+            success.setMsg(dtoStr);
+            return success;
         } catch (Exception e) {
             log.error("exception of handler:{}", e.getMessage(), e);
             ReturnT<String> fail = ReturnT.FAIL;
@@ -78,7 +82,9 @@ public class PlatformTaskHandler {
             ResponseDto<String> dto = feignPlatformCandyTaskClient.dueProcessForCommon();
             String dtoStr = JsonUtils.toJson(dto);
             log.info("result of handler:{}", dtoStr);
-            return new ReturnT<>(dtoStr);
+            ReturnT<String> success = ReturnT.SUCCESS;
+            success.setMsg(dtoStr);
+            return success;
         } catch (Exception e) {
             log.error("exception of handler:{}", e.getMessage(), e);
             ReturnT<String> fail = ReturnT.FAIL;
@@ -94,7 +100,9 @@ public class PlatformTaskHandler {
             ResponseDto<String> dto = feignPlatformCandyTaskClient.dueProcessForUser();
             String dtoStr = JsonUtils.toJson(dto);
             log.info("result of handler:{}", dtoStr);
-            return new ReturnT<>(dtoStr);
+            ReturnT<String> success = ReturnT.SUCCESS;
+            success.setMsg(dtoStr);
+            return success;
         } catch (Exception e) {
             log.error("exception of handler:{}", e.getMessage(), e);
             ReturnT<String> fail = ReturnT.FAIL;

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/SweetCityVoteTaskHandler.java

@@ -24,7 +24,7 @@ public class SweetCityVoteTaskHandler {
             Boolean data = feignSweetTaskActivityClient.setStatList().getData();
             log.info("cityVoteStatHandler：结果：{}", data);
             ReturnT<String> success = ReturnT.SUCCESS;
-            success.setContent(String.valueOf(data));
+            success.setMsg(String.valueOf(data));
             return success;
         } catch (Exception e) {
             log.error("exception of handler:{}", e.getMessage(), e);

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/SweetWechatTaskHandler.java

@@ -24,7 +24,7 @@ public class SweetWechatTaskHandler {
             Object data = feignSweetWechatClient.send().getData();
             log.info("sendWechatMsgHandler：结果：{}", data);
             ReturnT<String> success = ReturnT.SUCCESS;
-            success.setContent(String.valueOf(data));
+            success.setMsg(String.valueOf(data));
             return success;
         } catch (Exception e) {
             log.error("exception of handler:{}", e.getMessage(), e);

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

@@ -120,6 +120,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
             }
 
+            if (performanceData == null || ticketTimesData == null || ticketData == null) {
+                return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
+            }
+
             if (payOrderParam.getIsExpress().equals(1) && ticketData.getIsExpress().equals(0)) {
                 return ResponseDto.failure("票种类型错误");//参数错误
             } else if (payOrderParam.getIsElectronic().equals(1) && ticketData.getIsElectronic().equals(0)) {
@@ -128,10 +132,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 return ResponseDto.failure("票种类型错误");//参数错误
             }
 
-
-            if (performanceData == null || ticketTimesData == null || ticketData == null) {
-                return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
-            }
             if (!ticketData.getTimeId().equals(payOrderParam.getTimeId()) || !ticketTimesData.getPerformanceId().equals(payOrderParam.getPerformanceId())) {
                 return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
             }
@@ -307,7 +307,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 return resultData;
             }
         } catch (Exception e) {
-            log.error("Kylin Order Pay Error = ", e);
+            log.error("Kylin Order Pay Error = {}", e);
             if (isDownGeneral) {
                 orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
                 for (AdamEntersVo enters : entersVoList) {
@@ -319,12 +319,15 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     }
                 }
             }
-            if (e.getMessage().equals("券不可用")) {
+            if(e.getMessage()==null){
+                return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常
+            }else if (e.getMessage().equals("券不可用")) {
                 return ResponseDto.failure(ErrorMapping.get("20030"));//券不可用
-            }
+            }else{
                 return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常
             }
         }
+    }
 
     private ResponseDto<PayInnerResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList, Integer isStudent, String content, String useTime, HashMap<String, Object> advanceMap) throws Exception {
         LinkedList<String> sqls = ObjectUtil.cloneLinkedListStr();