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

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinRoadShowVo.java

-package com.liquidnet.service.kylin.dto.vo.mongo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@ApiModel
-@Data
-public class KylinRoadShowVo {
-
-    @ApiModelProperty(value = "巡演主键", example = "测试场地")
-    private String roadShowsId;
-    @ApiModelProperty(value = "状态 0停用 1启用", example = "1")
-    private String status;
-    @ApiModelProperty(value = "创建时间", example = "" , hidden = true)
-    private LocalDateTime createdAt;
-    @ApiModelProperty(value = "更新时间", example = "" , hidden = true)
-    private LocalDateTime updatedAt;
-
-}

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

@@ -7,7 +7,6 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.kylin.dao.RoadShowAdminListDao;
 import com.liquidnet.service.kylin.dto.param.CreateRoadShowParam;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinRoadShowVo;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinRoadShowAdminVo;
 import com.liquidnet.service.kylin.entity.KylinRoadShows;
 import com.liquidnet.service.kylin.mapper.KylinRoadShowsMapper;
@@ -55,9 +54,6 @@ public class KylinRoadShowsAdminServiceImpl extends ServiceImpl<KylinRoadShowsMa
             KylinRoadShows roadShows = new KylinRoadShows();
             BeanUtils.copyProperties(createRoadShowParam, roadShows);
             kylinRoadShowsMapper.insert(roadShows);
-            KylinRoadShowVo kylinRoadShowVo = new KylinRoadShowVo();
-            BeanUtils.copyProperties(createRoadShowParam, kylinRoadShowVo);
-            mongoTemplate.insert(roadShows, KylinRoadShowVo.class.getSimpleName());
             return roadShowId;
         } catch (Exception e) {
             return "";
@@ -72,8 +68,6 @@ public class KylinRoadShowsAdminServiceImpl extends ServiceImpl<KylinRoadShowsMa
             createRoadShowParam.setStatus(null);
             BeanUtils.copyProperties(createRoadShowParam, roadShows);
             kylinRoadShowsMapper.update(roadShows, new UpdateWrapper<KylinRoadShows>().eq("road_shows_id", createRoadShowParam.getRoadShowsId()));
-            KylinRoadShowVo kylinRoadShowVo = new KylinRoadShowVo();
-            BeanUtils.copyProperties(createRoadShowParam, kylinRoadShowVo);
 
             BasicDBObject objectRoadShowVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(roadShows));
             mongoTemplate.getCollection(KylinRoadShows.class.getSimpleName()).updateOne(

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/codec/aspect/DecryptAndVerifyAspect.java

 package com.liquidnet.service.base.codec.aspect;
 
 import com.alibaba.fastjson.JSON;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.codec.annotation.DecryptAndVerify;
 import com.liquidnet.service.base.codec.exception.DecryptAndVerifyException;
 import com.liquidnet.service.base.codec.util.CodecUtil;
@@ -42,7 +43,9 @@ public class DecryptAndVerifyAspect {
         if (encryptedReq == null) {
             throw new DecryptAndVerifyException(joinPoint.getSignature().getName() + "，参数中无待解密类");
         }
+        log.info("DecryptAndVerifyAspect 解密前 下单request:{}", JsonUtils.toJson(encryptedReq));
         String decryptedData = decryptAndVerify(encryptedReq);
+        log.info("DecryptAndVerifyAspect 解密后 下单request:{}", decryptedData);
         MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
         DecryptAndVerify annotation = methodSignature.getMethod().getAnnotation(DecryptAndVerify.class);
         if (annotation == null || annotation.decryptedClass() == null) {

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

@@ -449,24 +449,24 @@ public class DataUtils {
      * @return
      */
     public BigDecimal getCanRefundOrderEntitiesPrice(KylinOrderTicketVo orderTicketVo, List<KylinOrderRefundsVo> kylinOrderRefundsVoBaseList, String orderTicketEntitiesId) {
-        log.info("orderTicketEntitiesId = "+orderTicketEntitiesId);
+        log.info("orderTicketEntitiesId = " + orderTicketEntitiesId);
         //单票实付价格
         BigDecimal singlePrice = orderTicketVo.getPriceActual().subtract(orderTicketVo.getPriceExpress()).divide(BigDecimal.valueOf(orderTicketVo.getNumber()));
-        log.info("singlePrice = "+singlePrice);
+        log.info("singlePrice = " + singlePrice);
         //单票剩余未退款金额
         BigDecimal canRefundSinglePrice = new BigDecimal("0.00");
         for (KylinOrderTicketEntitiesVo item : orderTicketVo.getEntitiesVoList()) {
             if (item.getOrderTicketEntitiesId().equals(orderTicketEntitiesId)) {
-                log.info("item = "+item);
+                log.info("item = " + item);
                 canRefundSinglePrice = singlePrice.subtract(item.getRefundPrice() == null ? BigDecimal.valueOf(0.00) : item.getRefundPrice());
             }
         }
-        log.info("canRefundSinglePrice = "+canRefundSinglePrice);
+        log.info("canRefundSinglePrice = " + canRefundSinglePrice);
         //订单锁定金额
         BigDecimal orderLockPrice = new BigDecimal("0.00");
         for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
             int status = refundVo.getStatus();
-            if (status == 0 || status == 3 ||  status == 7) { //退款流程未完成 金额锁定
+            if (status == 0 || status == 1 || status == 3 || status == 6 || status == 7 || status == 8) { //退款流程未完成 金额锁定
                 List<KylinOrderRefundEntitiesVo> refundEntitiesVos = refundVo.getOrderRefundEntitiesVoList();
                 for (KylinOrderRefundEntitiesVo refundEntitiesVo : refundEntitiesVos) {
                     if (refundEntitiesVo.getOrderTicketEntitiesId().equals(orderTicketEntitiesId)) {
@@ -475,7 +475,7 @@ public class DataUtils {
                 }
             }
         }
-        log.info("orderLockPrice = "+orderLockPrice);
+        log.info("orderLockPrice = " + orderLockPrice);
         //订单可退金额
         BigDecimal refundSinglePrice = canRefundSinglePrice.subtract(orderLockPrice);
         //是否包含快递费

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -12,6 +12,8 @@ public class SweetConstant {
     public final static String REDIS_KEY_SWEET_MANUAL_SORT = "sweet:manual:sort:manual:";
 
     public final static String REDIS_KEY_SWEET_ARTISTS_RELATION = "sweet:artists:relation:uid:";
+    public final static String REDIS_KEY_SWEET_SHOP = "sweet:artists:shop:manual:";
+
 
     public final static String REDIS_KEY_SWEET_REMIND="sweet:remind:unionId:";
     public static final String REDIS_KEY_SWEET_REMIND_ALL = "sweet:remind:unionId*";

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

 package com.liquidnet.service.sweet.controller;
 
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 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.SweetManualNotify;
+import com.liquidnet.service.sweet.entity.SweetManualShop;
 import com.liquidnet.service.sweet.entity.SweetRichtext;
-import com.liquidnet.service.sweet.entity.SweetStage;
 import com.liquidnet.service.sweet.utils.RedisDataUtils;
 import com.liquidnet.service.sweet.vo.SweetArtistsRelationVo;
+import com.liquidnet.service.sweet.vo.SweetManualShopAllVo;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -69,7 +69,7 @@ public class SweetAppletController {
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页数", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
     })
-    public ResponseDto<SweetManualArtistList2Dto> timeList(@RequestParam( )String manualId,
+    public ResponseDto<SweetManualArtistList2Dto> timeList(@RequestParam() String manualId,
                                                            @RequestParam() String dateTime,
                                                            @RequestParam() String stage,
                                                            @RequestParam() Integer isSign,
@@ -119,15 +119,15 @@ public class SweetAppletController {
                 item.setIsWatch(0);
                 item.setIsSign(0);
 
-                for (String artistsId: relationData.getWatchList()) {
-                    if(artistsId.equalsIgnoreCase(item.getArtistId())){
+                for (String artistsId : relationData.getWatchList()) {
+                    if (artistsId.equalsIgnoreCase(item.getArtistId())) {
                         item.setIsWatch(1);
                         break;
                     }
                 }
 
-                for (String artistsId: relationData.getSignList()) {
-                    if(artistsId.equalsIgnoreCase(item.getArtistId())){
+                for (String artistsId : relationData.getSignList()) {
+                    if (artistsId.equalsIgnoreCase(item.getArtistId())) {
                         item.setIsSign(1);
                         break;
                     }
@@ -153,7 +153,7 @@ public class SweetAppletController {
         return ResponseDto.success(redisDataUtils.getRichTextRedisData(manualId, type));
     }
 
-    @GetMapping("artistsWatch")
+    @PostMapping("artistsWatch")
     @ApiOperation("艺人-想看")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
@@ -165,7 +165,7 @@ public class SweetAppletController {
         return ResponseDto.success();
     }
 
-    @GetMapping("artistsSign")
+    @PostMapping("artistsSign")
     @ApiOperation("艺人-签售")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
@@ -176,4 +176,37 @@ public class SweetAppletController {
         redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, "watch");
         return ResponseDto.success();
     }
+
+    @GetMapping("manualShop")
+    @ApiOperation("吃喝玩乐")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人id", required = true)
+    })
+    public ResponseDto<SweetManualShopAllVo> manualShop(@RequestParam String manualId) {
+        List<SweetManualShop> shopList = redisDataUtils.getManualShopRedisData(manualId);
+
+        List<SweetManualShop> recommend = new ArrayList<>();
+        List<SweetManualShop> eat = new ArrayList<>();
+        List<SweetManualShop> play = new ArrayList<>();
+        SweetManualShopAllVo vo = SweetManualShopAllVo.getNew();
+
+        for (SweetManualShop item : shopList) {
+            if(item.getIsRecommend().equals(1)){
+                recommend.add(item);
+            }
+            if(item.getType().equals(1)){
+                eat.add(item);
+            }
+            if(item.getType().equals(2)){
+                play.add(item);
+            }
+        }
+
+        vo.setRecommend(recommend);
+        vo.setEat(eat);
+        vo.setPlay(play);
+
+        return ResponseDto.success(vo);
+    }
 }

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

@@ -11,6 +11,7 @@ import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto;
 import com.liquidnet.service.sweet.dto.SweetManualArtistListDto;
 import com.liquidnet.service.sweet.dto.SweetManualArtistStageListDto;
 import com.liquidnet.service.sweet.entity.SweetManualNotify;
+import com.liquidnet.service.sweet.entity.SweetManualShop;
 import com.liquidnet.service.sweet.entity.SweetManualSort;
 import com.liquidnet.service.sweet.entity.SweetRichtext;
 import com.liquidnet.service.sweet.mapper.*;
@@ -36,6 +37,8 @@ public class RedisDataUtils {
     private SweetManualSortMapper sweetManualSortMapper;
     @Autowired
     private SweetManualNotifyMapper sweetManualNotifyMapper;
+    @Autowired
+    private SweetManualShopMapper sweetManualShopMapper;
 
 
     public List<SweetManualAppletDto> setPushList() {
@@ -193,20 +196,20 @@ public class RedisDataUtils {
         redisUtil.del(SweetConstant.REDIS_KEY_SWEET_MANUAL_SORT.concat(manualId));//列表
     }
 
-    public void setArtistsRelationRedisVo(String uid, String artistsId ,String type) {
+    public void setArtistsRelationRedisVo(String uid, String artistsId, String type) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_RELATION.concat(uid);
         SweetArtistsRelationVo vo = getArtistsRelationRedisVo(uid);
         vo.setUid(uid);
-        if(type.equalsIgnoreCase("sign")){
-            if(vo.getSignList().contains(artistsId)){
+        if (type.equalsIgnoreCase("sign")) {
+            if (vo.getSignList().contains(artistsId)) {
                 vo.getSignList().remove(artistsId);
-            }else{
+            } else {
                 vo.getSignList().add(artistsId);
             }
-        }else if(type.equalsIgnoreCase("watch")){
-            if(vo.getWatchList().contains(artistsId)){
+        } else if (type.equalsIgnoreCase("watch")) {
+            if (vo.getWatchList().contains(artistsId)) {
                 vo.getWatchList().remove(artistsId);
-            }else{
+            } else {
                 vo.getWatchList().add(artistsId);
             }
         }
@@ -225,6 +228,24 @@ public class RedisDataUtils {
         }
     }
 
+    //获取 商铺
+    public List<SweetManualShop> setManualShopRedisData(String manualId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_SHOP.concat(manualId);
+        List<SweetManualShop> list = sweetManualShopMapper.selectList(Wrappers.lambdaQuery(SweetManualShop.class).eq(SweetManualShop::getManualId, manualId).orderBy(true,false,SweetManualShop::getSort));
+        redisUtil.set(redisKey, list);
+        return list;
+    }
+
+    public List<SweetManualShop> getManualShopRedisData(String manualId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_SHOP.concat(manualId);
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return setManualShopRedisData(manualId);
+        } else {
+            return (List<SweetManualShop>) obj;
+        }
+    }
+
 //    // 小程序演出提醒
 //    public void setSweetRemind(String openId, String unionId, String performancesId, KylinPerformanceVo performanceInfo) {
 //        String redisKey = SweetConstant.REDIS_KEY_SWEET_REMIND.concat(unionId);

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

+package com.liquidnet.service.sweet.vo;
+
+import com.liquidnet.service.sweet.entity.SweetManualShop;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ApiModel
+public class SweetManualShopAllVo implements Serializable ,Cloneable {
+    @ApiModelProperty("推荐")
+    private List<SweetManualShop> recommend;
+    @ApiModelProperty("吃喝")
+    private List<SweetManualShop> eat;
+    @ApiModelProperty("玩乐")
+    private List<SweetManualShop> play;
+
+    private static final SweetManualShopAllVo obj = new SweetManualShopAllVo();
+    public static SweetManualShopAllVo getNew() {
+        try {
+            return (SweetManualShopAllVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualShopAllVo();
+        }
+    }
+}