Merge branch 'master' into change_candy_bug

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add1.html

@@ -328,7 +328,7 @@
         filterData.reduce((cur, next) => {
             if (!obj[next.timeId]) {
                 obj[next.timeId] = true
-                str+= `<option value='${next.timeId}' label=${next.timeTitle}>${next.timeTitle}</option>`
+                str+= `<option value='${next.timeId}' label='${next.timeTitle}'>${next.timeTitle}</option>`
             }
         }, [])
         selectTwoId = ''; // 选中演出下级的ID
@@ -368,7 +368,7 @@
         let str = `<option value="0" label="" >所有</option>`;
         searchData.forEach(item=>{
             if (item.timeId == selectTwoId) {
-                str+= `<option value='${item.ticketId}' label=${item.ticketTitle}>${item.ticketTitle}</option>`
+                str+= `<option value='${item.ticketId}' label='${item.ticketTitle}'>${item.ticketTitle}</option>`
             }
         })
         selectThreeId = ''; // 选中演出三级的ID

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add101.html

@@ -309,7 +309,7 @@
         let str = `<option value="0" label="">所有</option>`;
         searchData.forEach(item=>{
             if (item.performancesId == id) {
-                str+= `<option value='${item.timeId}' label=${item.timeTitle}>${item.timeTitle}</option>`
+                str+= `<option value='${item.timeId}' label='${item.timeTitle}'>${item.timeTitle}</option>`
             }
         })
         selectTwoId = ''; // 选中演出下级的ID
@@ -343,7 +343,7 @@
         let str = `<option value="0" label="" >所有</option>`;
         searchData.forEach(item=>{
             if (item.timeId == selectTwoId) {
-                str+= `<option value='${item.ticketId}' label=${item.ticketTitle}>${item.ticketTitle}</option>`
+                str+= `<option value='${item.ticketId}' label='${item.ticketTitle}'>${item.ticketTitle}</option>`
             }
         })
         selectThreeId = ''; // 选中演出三级的ID

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add2.html

@@ -329,7 +329,7 @@
         filterData.reduce((cur, next) => {
             if (!obj[next.timeId]) {
                 obj[next.timeId] = true
-                str+= `<option value='${next.timeId}' label=${next.timeTitle}>${next.timeTitle}</option>`
+                str+= `<option value='${next.timeId}' label='${next.timeTitle}'>${next.timeTitle}</option>`
             }
         }, [])
         selectTwoId = ''; // 选中演出下级的ID
@@ -369,7 +369,7 @@
         let str = `<option value="0" label="" >所有</option>`;
         searchData.forEach(item=>{
             if (item.timeId == selectTwoId) {
-                str+= `<option value='${item.ticketId}' label=${item.ticketTitle}>${item.ticketTitle}</option>`
+                str+= `<option value='${item.ticketId}' label='${item.ticketTitle}'>${item.ticketTitle}</option>`
             }
         })
         selectThreeId = ''; // 选中演出三级的ID

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add3.html

@@ -246,7 +246,7 @@
         filterData.reduce((cur, next) => {
             if (!obj[next.timeId]) {
                 obj[next.timeId] = true
-                str+= `<option value='${next.timeId}' label=${next.timeTitle}>${next.timeTitle}</option>`
+                str+= `<option value='${next.timeId}' label='${next.timeTitle}'>${next.timeTitle}</option>`
             }
         }, [])
         selectTwoId = ''; // 选中演出下级的ID
@@ -279,7 +279,7 @@
         let str = `<option value="0" label="" >所有</option>`;
         searchData.forEach(item=>{
             if (item.timeId == selectTwoId) {
-                str+= `<option value='${item.ticketId}' label=${item.ticketTitle}>${item.ticketTitle}</option>`
+                str+= `<option value='${item.ticketId}' label='${item.ticketTitle}'>${item.ticketTitle}</option>`
             }
         })
         selectThreeId = ''; // 选中演出三级的ID

liquidnet-bus-config/liquidnet-config/liquidnet-service-order-k8s-test.yml

@@ -25,4 +25,6 @@ liquidnet:
     check: ${liquidnet.service.order.url-pay.check}
     localUrl: ${liquidnet.service.order.url-pay.localUrl}
   adam:
-    url:${liquidnet.service.adam.url}
+    url: ${liquidnet.service.adam.url}
+  candy:
+    url: ${liquidnet.service.candy.url}

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/service/impl/ChimePerformanceServiceImpl.java

@@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -90,9 +92,14 @@ public class ChimePerformanceServiceImpl implements IChimePerformanceService {
             Pageable pageable = PageRequest.of(pageNum, pageSize); // get 5 profiles on a page
             Query query = Query.query(criteria);
             query.with(pageable);
+            query.with(Sort.by(	//根据集合中对象的某个字段排序
+                    Sort.Order.desc("createdAt")
+            ));
 
             startTime = System.currentTimeMillis();
             List<ChimeUserInfoVo> chimeUserInfoVoList = mongoTemplate.find(query, ChimeUserInfoVo.class, ChimeUserInfoVo.class.getSimpleName());
+            //打乱排序
+            Collections.shuffle(chimeUserInfoVoList);
             endTime = System.currentTimeMillis();
             log.info("查询标签数据 分页数据 耗时：{}ms",endTime-startTime);
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/express/shunfeng/PerformancesExpressCallbackServiceImpl.java

@@ -64,6 +64,7 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
     private DataUtils dataUtils;
 
     public boolean orderStatus(@RequestBody String params) {
+        log.info("接收ExpressOrderStatus请求：[params={}]", params);
         boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest);
         if (res) {
             PerformanceExpressPushStatusParam performanceExpressPushStatusParam = JsonUtils.fromJson(params, PerformanceExpressPushStatusParam.class);
@@ -90,6 +91,7 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
     }
 
     public boolean orderFreightList(@RequestBody String params) {
+        log.info("接收ExpressOrderFreightList请求：[params={}]", params);
         boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest);
         if (res) {
             PerformanceExpressPushFreightParam performanceExpressPushFreightParam = JsonUtils.fromJson(params, PerformanceExpressPushFreightParam.class);
@@ -117,6 +119,7 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
     }
 
     public boolean orderRoute(@RequestBody String params) {
+        log.info("接收ExpressOrderRoute请求：[params={}]", params);
         boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest);
 //        {"id":"123","mailno":"SF1020099313222","orderid":"NEW127745085969203221966686005","acceptTime":"2021-06-20 11:37:33","acceptAddress":"深圳市","remark":"顺丰已收件（测试推送）","opCode":"80","companyId":"557104628450889728","routeAddress":"https://devplatform.zhengzai.tv/platform/performancesExpress/orderRoute"}
         if (res) {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatActionCallbackController.java

@@ -59,6 +59,7 @@ public class SweetWechatActionCallbackController {
             @RequestParam(name = "encrypt_type", required = false) String encType,
             @RequestParam(name = "msg_signature", required = false) String msgSignature
     ) {
+        try {
             log.info("\n接收微信请求：[type=[{}], openid=[{}], [signature=[{}], encType=[{}], msgSignature=[{}],"
                             + " timestamp=[{}], nonce=[{}], requestBody=[\n{}\n] ",
                     type, openid, signature, encType, msgSignature, timestamp, nonce, requestBody);
@@ -67,5 +68,9 @@ public class SweetWechatActionCallbackController {
                 return "";
             }
             return sweetWechatCallbackService.record(requestBody, type, timestamp, nonce, encType, msgSignature);
+        } catch (Exception e) {
+            log.error("用户动作微信回调Exception：[msg=[{}], e=[{}]]", e.getMessage(), e);
+            return "";
+        }
     }
 }