Merge remote-tracking branch 'origin/jxl_0322' into pre

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

@@ -137,7 +137,7 @@ public class KylinRefundExecuteServiceImpl {
         }
 
         int count = 0;
-        int limitNum = 20;
+        int limitNum = 1000;
         int mid = 0;
         do {
             List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.getRefundList(whereType, refundBatchId, whereStatus, mid, limitNum);

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

@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.MongoVoUtils;
@@ -41,6 +42,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -403,6 +405,15 @@ public class KylinRefundsStatusServiceImpl {
         kylinOrderRefunds.setRefuse(refundApplyParam.getRefuse());
 
         for (KylinOrderRefunds refund : refundList) {
+            KylinOrderRefunds orderRefundsOld = kylinOrderRefundsMapper.selectOne(
+                    Wrappers.lambdaQuery(KylinOrderRefunds.class)
+                            .eq(KylinOrderRefunds::getOrderRefundsId, refund.getOrderRefundsId())
+            );
+            if (!Objects.equals(orderRefundsOld.getStatus(), KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED)
+                && !Objects.equals(orderRefundsOld.getStatus(), KylinTableStatusConst.ORDER_REFUND_STATUS_TICKET)
+            ) {
+                continue;
+            }
             // 更新退款表
             kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
             kylinOrderRefundsMapper.update(

liquidnet-bus-feign/liquidnet-api-feign-platform/src/main/java/com/liquidnet/service/feign/platform/task/FeignPlatformCandyTaskClient.java

@@ -30,5 +30,5 @@ public interface FeignPlatformCandyTaskClient {
     ResponseDto<String> dueProcessForUser();
 
     @GetMapping("followDoTask/doTask")
-    ResponseDto doTask();
+    ResponseDto<String> doTask();
 }

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

@@ -109,7 +109,7 @@ public class KylinCameraController {
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "pageNum", value = "页码"),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "pageSize", value = "数量")
     })
-    public ResponseDto describeDevices(
+    public ResponseDto<String> describeDevices(
             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
             @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize
     ) {
@@ -182,16 +182,16 @@ public class KylinCameraController {
                 dataUtils.setCameraDevices(fieldId, kylinApiCameraDevicesVoArrayList);
             }
 
-            return ResponseDto.success();
+            return ResponseDto.success("success");
         } catch (ClientException | JsonProcessingException e) {
             log.error("获取设备列表Exception：[msg={}, e={}]", e.getMessage(), e);
-            return ResponseDto.failure();
+            return ResponseDto.failure("获取设备列表Exception");
         }
     }
 
     @GetMapping(value = "detectPedestrian")
     @ApiOperation("人体识别")
-    public ResponseDto detectPedestrian() {
+    public ResponseDto<String> detectPedestrian() {
         long startTime1 = System.currentTimeMillis();
         List<KylinCamera> cameraList = dataUtils.getCameraDevicesList();
         if (null == cameraList) {
@@ -208,7 +208,7 @@ public class KylinCameraController {
                 this.getPersonNum(kylinCamera);
             }
         }
-        return ResponseDto.success();
+        return ResponseDto.success("success");
     }
 
     private void getPersonNum(KylinCamera kylinCamera) {

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

 package com.liquidnet.service.platform.controller.refund;
 
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.platform.service.refund.OrderRefundsCallbackServiceImpl;
 import io.swagger.annotations.Api;
@@ -35,15 +36,13 @@ public class OrderRefundCallbackController {
 
     @GetMapping("alipayActiveCallback")
     @ApiOperation("支付宝主动查询退款结果")
-    public String alipayActiveCallback() {
-        String result = orderRefundsCallbackServiceImpl.alipayActiveCallback();
-        return result;
+    public ResponseDto<String> alipayActiveCallback() {
+        return orderRefundsCallbackServiceImpl.alipayActiveCallback();
     }
 
     @GetMapping("overtimeRefund")
     @ApiOperation("超时支付自动退款")
-    public String overtimeRefund() {
-        String result = orderRefundsCallbackServiceImpl.overtimeRefund();
-        return result;
+    public ResponseDto<String> overtimeRefund() {
+        return orderRefundsCallbackServiceImpl.overtimeRefund();
     }
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/sweet/TaskController.java

@@ -37,7 +37,7 @@ public class TaskController {
 
     @GetMapping("doTask")
     @ApiOperation("关注任务加积分")
-    public ResponseDto doTask() {
+    public ResponseDto<String> doTask() {
         int size = 1000;
 
         int doCount = usersMapper.selectListDoCount();
@@ -58,7 +58,7 @@ public class TaskController {
                 }
             }
         }
-        return ResponseDto.success();
+        return ResponseDto.success("success");
     }
 
 }
\ No newline at end of file

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
@@ -138,7 +139,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
         return null;
     }
 
-    public String alipayActiveCallback() {
+    public ResponseDto<String> alipayActiveCallback() {
         LocalDateTime startTime = LocalDateTime.now();
         LocalDateTime newTime = startTime.minusHours(2);
         List<KylinOrderRefunds> kylinOrderRefunds = kylinOrderRefundsMapper.selectList(
@@ -170,10 +171,10 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
 
             }
         }
-        return "success";
+        return ResponseDto.success("success");
     }
 
-    public String overtimeRefund() {
+    public ResponseDto<String> overtimeRefund() {
         List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.selectList(
                 Wrappers.lambdaQuery(KylinOrderRefunds.class)
                         .eq(KylinOrderRefunds::getType, KylinTableStatusConst.ORDER_REFUND_TYPE_AUTO)
@@ -285,6 +286,6 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
                 continue;
             }
         }
-        return "success";
+        return ResponseDto.success("success");
     }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetArtistsServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto;
@@ -20,6 +21,7 @@ import com.liquidnet.service.sweet.service.ISweetArtistsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.service.sweet.utils.RedisDataUtils;
 import com.liquidnet.service.sweet.vo.SweetArtistsVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,6 +38,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-07-23
  */
+@Slf4j
 @Service
 public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, SweetArtists> implements ISweetArtistsService {
 
@@ -140,17 +143,23 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
                 sweetArtistsUrl.setType("1");
                 sweetArtistsUrlMapper.insert(sweetArtistsUrl);
             }
+            String[] videoArray = sweetArtistsList.getVideoArray();
+            if (null != videoArray && videoArray.length > 0) {
                 for (String video : sweetArtistsList.getVideoArray()) {
                     sweetArtistsUrl.setUrl(video);
                     sweetArtistsUrl.setType("2");
                     sweetArtistsUrlMapper.insert(sweetArtistsUrl);
                 }
+            }
+
             List<SweetManualArtists> data = sweetManualArtistsMapper.selectList(Wrappers.lambdaQuery(SweetManualArtists.class).eq(SweetManualArtists::getArtistsId, artistsId));
             for (SweetManualArtists item : data) {
                 redisDataUtils.deleteTimeListRedisData(item.getManualId());
             }
             return ResponseDto.success();
         } catch (Exception e) {
+            log.error("sweetArtistsChangeExc", e);
+            log.error("sweetArtistsChangeE [e:{}]", e);
             return ResponseDto.failure();
         }
     }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetIntegralActivityServiceImpl.java

@@ -83,7 +83,8 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
     public ResponseDto setDrawAllList(String integralActivityId) {
         List<SweetIntegralActivityDraw> sweetIntegralActivityDraws = drawMapper.selectList(
                 Wrappers.lambdaQuery(SweetIntegralActivityDraw.class).eq(SweetIntegralActivityDraw::getIntegralActivityId, integralActivityId)
-                        .last("limit 0,35")
+                        .orderByDesc(SweetIntegralActivityDraw::getMid)
+                        .last("limit 35")
         );
 
         List<String> asList = Arrays.asList(