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

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

@@ -39,7 +39,7 @@ liquidnet:
   mongodb:
     host: 39.106.122.201:27017
     port: 27017
-    user: root
+    user: admin
     pwd: S&y$6d*JwJ
   service:
     adam:

liquidnet-bus-config/liquidnet-config/liquidnet-service-dragon-dev.yml

@@ -14,7 +14,7 @@ liquidnet:
     pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
-    level: debug
+    level: info
   mysql:
     database-name: dev_ln_scene
   mongodb:

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/pom.xml

@@ -64,8 +64,9 @@
         </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-service-dragon-api</artifactId>
+            <artifactId>liquidnet-service-dragon-do</artifactId>
             <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/dragon/DragonPayController.java

 package com.liquidnet.service.platform.controller.dragon;
 
-import io.swagger.annotations.Api;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.commons.lang.util.StringUtil;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.dto.DragonOrdersDto;
+import com.liquidnet.service.dragon.entity.DragonOrders;
+import com.liquidnet.service.platform.service.dragon.IDragonOrdersService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * @author AnJiabin <anjiabin@zhengzai.tv>
@@ -14,9 +23,31 @@ import org.springframework.web.bind.annotation.RestController;
  * @Copyright: LightNet @ Copyright (c) 2021
  * @date 2021/7/20 14:11
  */
-@Api(tags = "前端-订单相关")
+@Api(tags = "支付-查询接口")
 @RestController
 @RequestMapping("dragon")
 @Validated
 public class DragonPayController {
+    @Autowired
+    IDragonOrdersService dragonOrdersService;
+
+    @GetMapping("/getDragonOrderDto")
+    @ApiOperation("订单查询")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "", example = "PAY202107131522368438531155")
+    })
+    @ResponseBody
+    public ResponseDto<DragonOrdersDto> getDragonOrderDto(@RequestParam(value = "code") @NotNull(message = "支付编号不能为空！") String code){
+        //获取用户会员信息
+        LambdaQueryWrapper<DragonOrders> lambdaQueryWrapper = new LambdaQueryWrapper();
+        lambdaQueryWrapper.eq(DragonOrders::getCode,code);
+        DragonOrders respDto = dragonOrdersService.getOne(lambdaQueryWrapper);
+        if(StringUtil.isNull(respDto)){
+            return ResponseDto.failure("订单不存在！code: "+code);
+        }
+        DragonOrdersDto newDto = new DragonOrdersDto();
+        BeanUtil.copy(respDto,newDto);
+        return ResponseDto.success(newDto);
+    }
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/dragon/IDragonOrdersService.java

+package com.liquidnet.service.platform.service.dragon;
+
+import com.liquidnet.service.dragon.entity.DragonOrders;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 支付订单表 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-07-20
+ */
+public interface IDragonOrdersService extends IService<DragonOrders> {
+
+}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/dragon/DragonOrdersServiceImpl.java

+package com.liquidnet.service.platform.service.impl.dragon;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.service.dragon.entity.DragonOrders;
+import com.liquidnet.service.dragon.mapper.DragonOrdersMapper;
+import com.liquidnet.service.platform.service.dragon.IDragonOrdersService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 支付订单表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-07-20
+ */
+@Service
+public class DragonOrdersServiceImpl extends ServiceImpl<DragonOrdersMapper, DragonOrders> implements IDragonOrdersService {
+
+}

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

 package com.liquidnet.service.sweet.controller;
 
-import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.dto.SweetManualAppletDto;
 import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto;
 import com.liquidnet.service.sweet.dto.SweetManualArtistListDto;
-import com.liquidnet.service.sweet.entity.SweetArtists;
 import com.liquidnet.service.sweet.entity.SweetManualNotify;
 import com.liquidnet.service.sweet.entity.SweetManualShop;
 import com.liquidnet.service.sweet.entity.SweetRichtext;
@@ -17,7 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Api(tags = "小程序")
 @RestController
@@ -93,7 +94,7 @@ public class SweetAppletController {
         List<SweetManualArtistListDto> returnArtist = new ArrayList();
 
         SweetManualArtistList2Dto data = redisDataUtils.getTimeList(manualId);
-        SweetArtistsRelationVo relationData = redisDataUtils.getArtistsRelationRedisVo(uid);
+        SweetArtistsRelationVo relationData = redisDataUtils.getArtistsRelationRedisVo(uid, manualId);
 
         List<SweetManualArtistListDto> artistData = data.getData();
 
@@ -189,13 +190,15 @@ public class SweetAppletController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
     })
     public ResponseDto<Boolean> watch(@RequestParam() String uid,
-                                      @RequestParam() String artistsId) {
+                                      @RequestParam() String artistsId,
+                                      @RequestParam() String manualId) {
         if (uid.equalsIgnoreCase("0")) {
             return ResponseDto.failure();
         }
-        redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, "watch");
+        redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, manualId, "watch");
         return ResponseDto.success();
     }
 
@@ -203,17 +206,45 @@ public class SweetAppletController {
     @ApiOperation("艺人-签售")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人id", required = true)
+            @ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
     })
     public ResponseDto<Boolean> sign(@RequestParam() String uid,
-                                     @RequestParam() String artistsId) {
+                                     @RequestParam() String artistsId,
+                                     @RequestParam() String manualId) {
         if (uid.equalsIgnoreCase("0")) {
             return ResponseDto.failure();
         }
-        redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, "sign");
+        redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, manualId, "sign");
         return ResponseDto.success();
     }
 
+    @PostMapping("manualASC")
+    @ApiOperation("该手册艺人收藏数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
+    })
+    public ResponseDto<Map> manualArtistsSaveCount(@RequestParam() String uid,
+                                                   @RequestParam() String manualId) {
+        if (uid.equalsIgnoreCase("0")) {
+            return ResponseDto.failure();
+        }
+        SweetArtistsRelationVo vo = redisDataUtils.getArtistsRelationRedisVo(uid, manualId);
+        int signSize = 0;
+        int watchSize = 0;
+        if (vo.getSignList() != null) {
+            signSize = vo.getSignList().size();
+        }
+        if (vo.getWatchList() != null) {
+            watchSize = vo.getWatchList().size();
+        }
+        HashMap<String,Object> map = CollectionUtil.mapStringObject();
+        map.put("signSize",signSize);
+        map.put("watchSize",watchSize);
+        return ResponseDto.success(map);
+    }
+
     @GetMapping("artistsDetails")
     @ApiOperation("艺人-详情")
     @ApiImplicitParams({
@@ -226,7 +257,7 @@ public class SweetAppletController {
                                                                 @RequestParam String uid) {
         SweetManualArtistList2Dto data = redisDataUtils.getTimeList(manualId);
         List<SweetManualArtistListDto> dataList = data.getData();
-        SweetArtistsRelationVo relationData = redisDataUtils.getArtistsRelationRedisVo(uid);
+        SweetArtistsRelationVo relationData = redisDataUtils.getArtistsRelationRedisVo(uid, manualId);
 
         SweetManualArtistListDto vo = SweetManualArtistListDto.getNew();
         for (SweetManualArtistListDto item : dataList) {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -198,9 +198,9 @@ public class RedisDataUtils {
         redisUtil.del(SweetConstant.REDIS_KEY_SWEET_MANUAL_SORT.concat(manualId));//列表
     }
 
-    public void setArtistsRelationRedisVo(String uid, String artistsId, String type) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_RELATION.concat(uid);
-        SweetArtistsRelationVo vo = getArtistsRelationRedisVo(uid);
+    public void setArtistsRelationRedisVo(String uid, String artistsId,String manualId, String type) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_RELATION.concat(uid).concat(":manualId:").concat(manualId);
+        SweetArtistsRelationVo vo = getArtistsRelationRedisVo(uid,manualId);
         vo.setUid(uid);
         if (type.equalsIgnoreCase("sign")) {
             if (vo.getSignList() == null) {
@@ -233,8 +233,8 @@ public class RedisDataUtils {
 
     //获取 签售
     //获取 想看
-    public SweetArtistsRelationVo getArtistsRelationRedisVo(String uid) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_RELATION.concat(uid);
+    public SweetArtistsRelationVo getArtistsRelationRedisVo(String uid,String manualId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_RELATION.concat(uid).concat(":manualId:").concat(manualId);
         Object obj = redisUtil.get(redisKey);
         if (obj == null) {
             return SweetArtistsRelationVo.getNew();

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/vo/SweetArtistsRelationVo.java

@@ -7,6 +7,7 @@ import java.util.ArrayList;
 @Data
 public class SweetArtistsRelationVo implements Cloneable{
     private String uid;
+    private String manualId;
     private ArrayList<String> signList;
     private ArrayList<String> watchList;