Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java

@@ -222,7 +222,7 @@ public class DataUtils {
                 redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.PERFORMANCES + performanceIds);
                 // 大龙相关 演出列表
                 redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.PERFORMANCES_LIST_CITYNAME + vo.getCityName());
-                redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.PERFORMANCES_LIST_CITY + vo.getCityId());
+                redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.PERFORMANCES_LIST_CITY.concat(String.valueOf(vo.getCityId())));
                 redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.PERFORMANCES_ROADLIST + vo.getRoadShowId());
                 redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.PERFORMANCES_LIST_SYSTEM_RECOMMEND);
                 redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.PERFORMANCES_LIST_RECOMMEND);

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -184,26 +184,12 @@ liquidnet:
     app-name: demo
     client-id: YXA6x4Xs7cYDQcOv6BPuM3hUDA
     client-secret: YXA6olr2qaW65xlkFixS81kiWnplrW4
-#  express:
-#    shunfeng:
-#      url: "https://butler-dev.sit.sf-express.com"
-#      sk: 21e9a70f677a2bf29dfa2b3bead4f018
-#      appid: 557104628450889728
-#      custid: "7551234567"
-#      jCompany: 北京正在映画互联网有限公司
-#      jContact: 摩登天空票务部
-#      jTel: 4006310750
-#      jProvince: 北京
-#      jCity: 北京市
-#      jAddress: 朝阳区广渠路1号北京市商业储运公司3-12号 摩登天空
-#      expressType: 2 # 默认顺丰特快
-#      depositumInfo: 演出纸质票
   express:
     shunfeng:
-      url: https://butler-ms.sf-express.com
-      sk: ab85956fcb97382e05396b67f3666098
-      appid: 572271814718803968
-      custid: "0102790784"
+      url: "https://butler-dev.sit.sf-express.com"
+      sk: 21e9a70f677a2bf29dfa2b3bead4f018
+      appid: 557104628450889728
+      custid: "7551234567"
       jCompany: 北京正在映画互联网有限公司
       jContact: 摩登天空票务部
       jTel: 4006310750
@@ -212,6 +198,20 @@ liquidnet:
       jAddress: 朝阳区广渠路1号北京市商业储运公司3-12号 摩登天空
       expressType: 2 # 默认顺丰特快
       depositumInfo: 演出纸质票
+#  express:
+#    shunfeng:
+#      url: https://butler-ms.sf-express.com
+#      sk: ab85956fcb97382e05396b67f3666098
+#      appid: 572271814718803968
+#      custid: "0102790784"
+#      jCompany: 北京正在映画互联网有限公司
+#      jContact: 摩登天空票务部
+#      jTel: 4006310750
+#      jProvince: 北京
+#      jCity: 北京市
+#      jAddress: 朝阳区广渠路1号北京市商业储运公司3-12号 摩登天空
+#      expressType: 2 # 默认顺丰特快
+#      depositumInfo: 演出纸质票
 
 
 #application-test-end

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

@@ -48,7 +48,7 @@ public class KylinPerformancesController {
     @ApiOperation("本地演出列表")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "cityName", value = "城市名称"),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "adCode", value = "城市code"),
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "adCode", value = "城市code"),
             @ApiImplicitParam(type = "query", dataType = "int", name = "days", value = "时间范围 几天 今天1 三天3。。。"),
             @ApiImplicitParam(type = "query", dataType = "int", name = "type", value = "演出类型 101音乐节 102小型演出(livehouse演出) 103巡演 演出类型只有这几个了"),
 
@@ -61,7 +61,7 @@ public class KylinPerformancesController {
     })
     public ResponseDto<HashMap<String, Object>> localList(
             @RequestParam(defaultValue = "") String cityName,
-            @RequestParam(defaultValue = "") String adCode,
+            @RequestParam(defaultValue = "0") Integer adCode,
             @RequestParam(defaultValue = "0") int days,
             @RequestParam(defaultValue = "0") int type,
 
@@ -127,12 +127,12 @@ public class KylinPerformancesController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "yearMonth", value = "年月 2021-01", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "cityName", value = "城市名称"),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "adCode", value = "城市code")
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "adCode", value = "城市code")
     })
     public ResponseDto<List> performanceCalendar(
             @RequestParam String yearMonth,
             @RequestParam(defaultValue = "") String cityName,
-            @RequestParam(defaultValue = "") String adCode
+            @RequestParam(defaultValue = "0") Integer adCode
     ) {
         List result = CollectionUtil.arrayListString();
         try {
@@ -148,12 +148,12 @@ public class KylinPerformancesController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "yearMonthDay", value = "年月日 2021-01-01", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "cityName", value = "城市名称"),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "adCode", value = "城市code")
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "adCode", value = "城市code")
     })
     public ResponseDto<List> calendarPerformances(
             @RequestParam String yearMonthDay,
             @RequestParam(defaultValue = "") String cityName,
-            @RequestParam(defaultValue = "") String adCode
+            @RequestParam(defaultValue = "0") Integer adCode
     ) {
         List result = null;
         result = kylinPerformancesService.calendarPerformances(yearMonthDay, cityName, adCode);

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

@@ -419,14 +419,14 @@ public class KylinOrderTicketsRefundServiceImpl {
                 String limitTypeCode = "";
                 String expressTypeCode = "";
                 Integer orderExpressStatus = 0;
-//                if (null == hashMap.get("succ") || hashMap.get("succ").equals("fail")) {
-                if (true) {
+                if (null == hashMap.get("succ") || hashMap.get("succ").equals("fail")) {
                     String msg = "";
                     if (null == hashMap.get("succ")) {
                         msg = result;
                     } else {
                         msg = (String) hashMap.get("msg");
                     }
+                    remark = msg;
                     orderExpressStatus = 1;
                 } else { // 成功下单记录缓存
                     // 生成快递单

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

@@ -62,7 +62,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
     private QueueUtils queueUtils;
 
     public HashMap<String, Object> localList(
-            int days, String cityName, String adCode, int type,
+            int days, String cityName, Integer adCode, int type,
             Integer isDiscount, Integer isAdvance, Integer isExclusive,
             String orderBy, String sort
     ) {
@@ -286,7 +286,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         return performanceList;
     }
 
-    public List performanceCalendar(String yearMonth, String cityName, String adCode) {
+    public List performanceCalendar(String yearMonth, String cityName, Integer adCode) {
         List<KylinPerformanceVo> performancesList = dataUtils.getPerformancesListOfcityNameOradCode(cityName, adCode);
 
         // 获取此月开始结束时间
@@ -314,7 +314,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         return newList;
     }
 
-    public List calendarPerformances(String yearMonthDay, String cityName, String adCode) {
+    public List calendarPerformances(String yearMonthDay, String cityName, Integer adCode) {
         List<KylinPerformanceVo> performancesList = dataUtils.getPerformancesListOfcityNameOradCode(cityName, adCode);
 
         String yearMonthDayStart = yearMonthDay.concat(" 00:00:00");

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

@@ -294,10 +294,10 @@ public class DataUtils {
      *
      * @param cityName
      */
-    public List<KylinPerformanceVo> getPerformancesListOfcityNameOradCode(String cityName, String adCode) {
+    public List<KylinPerformanceVo> getPerformancesListOfcityNameOradCode(String cityName, Integer adCode) {
         String redisKey = "";
         if (cityName.isEmpty()) {
-            redisKey = KylinRedisConst.PERFORMANCES_LIST_CITY.concat(adCode);
+            redisKey = KylinRedisConst.PERFORMANCES_LIST_CITY.concat(String.valueOf(adCode));
         } else {
             redisKey = KylinRedisConst.PERFORMANCES_LIST_CITYNAME.concat(cityName);
         }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/DataUtils.java

@@ -253,7 +253,7 @@ public class DataUtils {
                 redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.PERFORMANCES + performanceIds);
                 // 大龙相关 演出列表
                 redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.PERFORMANCES_LIST_CITYNAME + vo.getCityName());
-                redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.PERFORMANCES_LIST_CITY + vo.getCityId());
+                redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.PERFORMANCES_LIST_CITY.concat(String.valueOf(vo.getCityId())));
                 redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.PERFORMANCES_ROADLIST + vo.getRoadShowId());
                 redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.PERFORMANCES_LIST_SYSTEM_RECOMMEND);
                 redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.PERFORMANCES_LIST_RECOMMEND);