添加 controller

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinConsmerService.java

+package com.liquidnet.service.kylin.service;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.WqTempParam;
+import com.liquidnet.service.kylin.dto.vo.WqTempVo;
+
+/**
+ * <p>
+ * 补偿接口 胡佳晨
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-05
+ */
+public interface IKylinConsmerService {
+
+    ResponseDto<Boolean> orderTransferOverTime(String orderId);
+}

liquidnet-bus-config/liquidnet-config/liquidnet-service-candy.yml

@@ -97,6 +97,7 @@ global-auth:
     - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/candy-coupon/useBack
     - ${liquidnet.info.context}/candy-coupon/useBackJxl
+    - ${liquidnet.info.context}/inner/**
   oncheck-url-pattern:
 #    - ${liquidnet.info.context}/**
 # -----------------------------------------------------------

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/controller/CandyConsumerController.java

@@ -28,7 +28,7 @@ import java.util.List;
  * @since 2021-08-18
  */
 @RestController
-@RequestMapping("/candy-consumer")
+@RequestMapping("/inner/candy-consumer")
 public class CandyConsumerController {
 
     @Autowired

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/Inner/GoblinConsumerController.java

-package com.liquidnet.service.goblin.controller.Inner;
-
-import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.goblin.service.impl.inner.GoblinNftJobServiceImpl;
-import com.liquidnet.service.goblin.service.manage.IGoblinConsumerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Slf4j
-@Api(tags = "@API:RSC:消费")
-@RestController
-@Validated
-@RequestMapping("/rsc/consumer")
-public class GoblinConsumerController {
-
-    @Autowired
-    IGoblinConsumerService goblinConsumerService;
-
-    @PostMapping("consumerType12")
-    @ApiOperation("xls 类型1/2")
-    @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "finalSkuId", value = "skuId"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "finalType", value = "类型"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "xlsPath", value = "文件地址"),
-    })
-    public ResponseDto<Boolean> consumerType12(String finalSkuId, Integer finalType, String xlsPath) {
-        return goblinConsumerService.consumerType12(finalSkuId, finalType, xlsPath);
-    }
-
-    @PostMapping("consumerType34")
-    @ApiOperation("xls 类型3/4")
-    @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "finalSkuId", value = "skuId"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "finalType", value = "类型"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "xlsPath", value = "文件地址"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "oXlsPath", value = "文件地址2"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "listId", value = "分批购活动id"),
-    })
-    public ResponseDto<Boolean> consumerType34(String finalSkuId, Integer finalType, String xlsPath, String oXlsPath, String listId) {
-        return goblinConsumerService.consumerType34(finalSkuId, finalType, xlsPath, oXlsPath, listId);
-    }
-}

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/Inner/GoblinInnerZhengzaiController.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreZhengzaiCommonParam;
 import com.liquidnet.service.goblin.dto.vo.*;
+import com.liquidnet.service.goblin.service.manage.IGoblinConsumerService;
 import com.liquidnet.service.goblin.service.manage.IGoblinInnerService;
 import com.liquidnet.service.goblin.service.manage.IGoblinZhengzaiService;
 import io.swagger.annotations.*;
@@ -28,6 +29,8 @@ public class GoblinInnerZhengzaiController {
     IGoblinZhengzaiService goblinZhengzaiService;
     @Autowired
     IGoblinInnerService goblinInnerService;
+    @Autowired
+    IGoblinConsumerService goblinConsumerService;
 
     @PostMapping("config/del/noAuth")
     @ApiOperation("活动详情-正在下单-删除商铺spu")
@@ -104,4 +107,28 @@ public class GoblinInnerZhengzaiController {
     public ResponseDto<TempCouponVo> getArData(@RequestParam("ucouponId") String ucouponId) {
         return goblinInnerService.getTempCouponData(ucouponId);
     }
+
+    @PostMapping("consumerType12")
+    @ApiOperation("xls 类型1/2")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "finalSkuId", value = "skuId"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "finalType", value = "类型"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "xlsPath", value = "文件地址"),
+    })
+    public ResponseDto<Boolean> consumerType12(String finalSkuId, Integer finalType, String xlsPath) {
+        return goblinConsumerService.consumerType12(finalSkuId, finalType, xlsPath);
+    }
+
+    @PostMapping("consumerType34")
+    @ApiOperation("xls 类型3/4")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "finalSkuId", value = "skuId"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "finalType", value = "类型"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "xlsPath", value = "文件地址"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "oXlsPath", value = "文件地址2"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "listId", value = "分批购活动id"),
+    })
+    public ResponseDto<Boolean> consumerType34(String finalSkuId, Integer finalType, String xlsPath, String oXlsPath, String listId) {
+        return goblinConsumerService.consumerType34(finalSkuId, finalType, xlsPath, oXlsPath, listId);
+    }
 }

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

@@ -6,6 +6,7 @@ import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.service.IKylinConsmerService;
 import com.liquidnet.service.kylin.utils.DataUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,6 +33,9 @@ public class InnerController {
     @Value("${liquidnet.adam.url}")
     private String adamUrl;
 
+    @Autowired
+    IKylinConsmerService kylinConsmerService;
+
     @GetMapping("cache/member/{uid}")
     @ApiOperation("获取会员相关数据")
     public void cacheMember(@NotBlank @PathVariable(value = "uid") String uid) {
@@ -46,7 +50,7 @@ public class InnerController {
                 if (null != userMemberVo) {
                     if (userMemberVo.getState() == 1) {
                         long second = ChronoUnit.SECONDS.between(LocalDateTime.now(), userMemberVo.getExpiryAt());
-                        log.debug("过期时间="+second);
+                        log.debug("过期时间=" + second);
                         if (userMemberVo.isOldMember()) {
                             dataUtils.saveMember(uid, 2, second);
                         } else {
@@ -62,4 +66,9 @@ public class InnerController {
         }
     }
 
+    @GetMapping("consumer/orderTransferOverTime")
+    @ApiOperation("转赠过期消费")
+    public ResponseDto<Boolean> orderTransferOverTime(String orderId) {
+        return kylinConsmerService.orderTransferOverTime(orderId);
+    }
 }

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

+package com.liquidnet.service.kylin.service.impl;
+
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.service.base.ErrorMapping;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.kylin.dto.param.WqTempParam;
+import com.liquidnet.service.kylin.dto.vo.WqTempVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
+import com.liquidnet.service.kylin.service.IKylinConsmerService;
+import com.liquidnet.service.kylin.service.IKylinTempService;
+import com.liquidnet.service.kylin.utils.DataUtils;
+import com.liquidnet.service.kylin.utils.QueueUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+
+/**
+ * <p>
+ * 轮播图 服务实现类
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-05-02
+ */
+@Service
+@Slf4j
+public class KylinConsumerServiceImpl implements IKylinConsmerService {
+
+    @Autowired
+    DataUtils dataUtils;
+
+
+    @Override
+    public ResponseDto<Boolean> orderTransferOverTime(String orderId) {
+        KylinOrderTicketVo vo = dataUtils.getOrderTicketVo(orderId);
+        String uid = vo.getTransferUid();
+        vo.setTransferUid("");
+        vo.setTransferStatus(0);
+        dataUtils.delTransferOrder(uid);
+        dataUtils.setOrderTicketVo(orderId, vo);
+        dataUtils.resetOrderListVo(vo.getUserId(), 2, orderId, vo);
+        return null;
+    }
+}

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

@@ -946,4 +946,63 @@ public class DataUtils {
         }
     }
 
+    /**
+     * @param userId  用户id
+     * @param type    1新增 2修改
+     * @param orderId 订单id [需要新增或者修改的订单id]
+     */
+    public Boolean resetOrderListVo(String userId, Integer type, String orderId, KylinOrderTicketVo dataSingle) {
+        List<KylinOrderListVo> vo = new ArrayList<>();
+        List<KylinOrderListVo> redisVo = new ArrayList();
+        KylinOrderTicketVo data = dataSingle;
+        KylinOrderListVo voItem = KylinOrderListVo.getNew().copy(data);
+        List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
+        if(redisData==null){
+            return false;
+        }
+        if (type == 1) {
+            redisVo.add(voItem);
+            if (redisData.size() > 0) {
+                if (redisData.get(0).getOrderTicketsId().equals(orderId)) {
+                    redisData.remove(0);
+                }
+            }
+        }
+
+        redisVo.addAll(redisData);
+
+        switch (type) {
+            case 1:
+                for (int i = 0; i < redisVo.size(); i++) {
+                    if (i == 40) {
+                        break;
+                    }
+                    if (i == 0) {
+                        vo.add(voItem);
+                    } else {
+                        vo.add(redisVo.get(i));
+                    }
+                }
+                if (redisVo.size() == 0) {
+                    vo.add(voItem);
+                }
+                redisUtil.set(KylinRedisConst.ORDER_LIST + userId, vo);
+                return true;
+            case 2:
+                for (int i = 0; i < redisVo.size(); i++) {
+                    if (i == 40) {
+                        break;
+                    }
+                    if (redisVo.get(i).getOrderTicketsId().equals(orderId)) {
+                        vo.add(voItem);
+                    } else {
+                        vo.add(redisVo.get(i));
+                    }
+                }
+                redisUtil.set(KylinRedisConst.ORDER_LIST + userId, vo);
+                return true;
+            default:
+                return false;
+        }
+    }
 }