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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/create.html

@@ -309,6 +309,7 @@
 
         // 跳转类型选择事件
         function targetObjBsSuggest(searchUrl, targetType) {
+            console.log(searchUrl)
             var taobaoBsSuggest = $("#targetObjSelect").bsSuggest({
                 indexId: 0,                 // data.value 每组数据的第几个数据，作为input输入框的 data-id，设为 -1 且 idField 为空则不设置此值
                 indexKey: 1,                // data.value 的第几个数据，作为input输入框的内容
@@ -324,7 +325,7 @@
                     Keyword: "名称"
                 },
                 showHeader: true,
-                url: searchUrl + '&title=',
+                url: searchUrl,
                 /*优先从url ajax 请求 json 帮助数据，注意最后一个参数为关键字请求参数*/
                 // jsonp: 'callback',
                 /*如果从 url 获取数据，并且需要跨域，则该参数必须设置*/
@@ -399,7 +400,8 @@
                 searchUrl = urleval.replace(/&(lt|gt|nbsp|amp|quot);/ig, function (all, t) {
                     return arrEntities[t];
                 });
-                console.log(searchUrl)
+                searchUrl = searchUrl.replaceAll(''', ''); //配置生效以后这个可能可去掉
+                // searchUrl = searchUrl.replaceAll('title=', ''); //配置生效以后这个可能可去掉
 
                 $("#targetObjSelectShow").show();
                 $("#targetObjInput").hide();

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

@@ -302,13 +302,10 @@ public class KylinRefundsStatusServiceImpl {
             kylinOrderRefundsMapper.update(kylinOrderRefunds, new UpdateWrapper<KylinOrderRefunds>()
                     .eq("order_refunds_id", orderRefundsId));
             // 修改缓存
-            KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
-            kylinOrderRefundsVo.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL);
-            kylinOrderRefundsVo.setUpdatedAt(LocalDateTime.now());
-            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderRefundsVo)));
             UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("orderRefundsId").is(orderRefundsId)).getQueryObject(),
-                    object
+                    new Document("$set", new Document("status", KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL)
+                            .append("updatedAt", LocalDateTime.now()))
             );
 
         }
@@ -361,7 +358,7 @@ public class KylinRefundsStatusServiceImpl {
         // 修改缓存
         KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
         BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
-        BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderRefundsVo)));
+        BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
         UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("orderRefundsId").in(orderRefundIds)).getQueryObject(),
                 object
@@ -412,7 +409,7 @@ public class KylinRefundsStatusServiceImpl {
             // 修改缓存
             KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
             BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
-            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderRefundsVo)));
+            BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
             UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("orderRefundsId").is(refund.getOrderRefundsId())).getQueryObject(),
                     object
@@ -546,7 +543,7 @@ public class KylinRefundsStatusServiceImpl {
         // 修改缓存
         KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
         BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
-        BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderRefundsVo)));
+        BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
         UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("orderRefundsId").is(refundInfo.getOrderRefundsId())).getQueryObject(),
                 object

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml

@@ -23,7 +23,7 @@ liquidnet:
       url1: "${liquidnet.client.admin.phpoMediaApiUrl}/api/video/list?per_page=50&page=1&type=1" #PGC点播
       url2: "${liquidnet.client.admin.phpoMediaApiUrl}/api/video/list?per_page=50&page=1&type=2" #PGC直播
       url5: "${liquidnet.client.admin.phpMallUrl}/admin/fieldListForQuick?page=1&per_page=50" #场地
-      url6: "https://devadmin.zhengzai.tv/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)" #票务
+      url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)" #票务
       url7: "${liquidnet.client.admin.phpMallUrl}/admin/goodListForQuick?page=1&per_page=50" #商品
       url8: "${liquidnet.client.admin.kylinApiUrl}/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
       url13: "${liquidnet.client.admin.phpMallUrl}/admin/integrationListForQuick?page=1&per_page=50" #积分商城

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

@@ -198,7 +198,7 @@ public class KylinRefundsStatusServiceImpl {
         // 修改缓存
         KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
         BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
-        BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderRefundsVo)));
+        BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
         UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("orderRefundsId").is(refundInfo.getOrderRefundsId())).getQueryObject(),
                 object

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

@@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
@@ -42,6 +43,9 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     @Autowired
     MongoTemplate mongoTemplate;
 
+    @Autowired
+    private MongoConverter mongoConverter;
+
     public String refundCallback(RefundCallbackParam refundCallbackParam) {
         KylinOrderRefunds refundInfo = kylinOrderRefundsMapper.selectOne(
                 new UpdateWrapper<KylinOrderRefunds>()
@@ -85,7 +89,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
             // 修改缓存
             KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
             BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
-            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderRefundsVo)));
+            BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
             UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("orderRefundsId").is(refundInfo.getOrderRefundsId())).getQueryObject(),
                     object