Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberOrderSimpleVo.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 
 @ApiModel(value = "AdamMemberOrderSimpleVo", description = "会员订单列表信息")
 @Data
-public class AdamMemberOrderSimpleVo implements Serializable {
+public class AdamMemberOrderSimpleVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 3978877550469933116L;
     @ApiModelProperty(position = 10, value = "订单号")
     private String orderNo;
@@ -29,4 +29,26 @@ public class AdamMemberOrderSimpleVo implements Serializable {
     private BigDecimal price;
     @ApiModelProperty(position = 17, value = "实付价格")
     private BigDecimal pricePaid;
+
+    private static final AdamMemberOrderSimpleVo obj = new AdamMemberOrderSimpleVo();
+
+    public static AdamMemberOrderSimpleVo getNew() {
+        try {
+            return (AdamMemberOrderSimpleVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AdamMemberOrderSimpleVo();
+        }
+    }
+
+    public AdamMemberOrderSimpleVo copy(AdamMemberOrderVo source) {
+        if (null == source) return this;
+        this.setOrderNo(source.getOrderNo());
+        this.setState(source.getState());
+        this.setCreatedAt(source.getCreatedAt());
+        this.setMemberName(source.getMemberName());
+        this.setMode(source.getMode());
+        this.setPrice(source.getPrice());
+        this.setPricePaid(source.getPricePaid());
+        return this;
+    }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -22,12 +22,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -497,6 +499,19 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
 //        }
 //        return pagedResult;
         // TODO: 2021/7/29 会员订单列表查取
-        return ObjectUtil.getAdamMemberOrderSimpleVoPagedResult();
+        PagedResult<AdamMemberOrderSimpleVo> pagedResult = ObjectUtil.getAdamMemberOrderSimpleVoPagedResult();
+        ArrayList<AdamMemberOrderVo> orderVos = adamRdmService.getMemberOrderVosByUid(uid);
+        if (!CollectionUtils.isEmpty(orderVos)) {
+            ArrayList<AdamMemberOrderSimpleVo> vos = ObjectUtil.getAdamMemberOrderSimpleVoArrayList();
+
+            orderVos.forEach(r -> {
+                vos.add(AdamMemberOrderSimpleVo.getNew().copy(r));
+            });
+
+            pagedResult.setTotal(orderVos.size(), 20);
+            pagedResult.setList(vos);
+        }
+
+        return pagedResult;
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/util/ObjectUtil.java

@@ -4,11 +4,11 @@ import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.base.PagedResult;
 
 import java.util.ArrayList;
-import java.util.List;
 
 public class ObjectUtil {
     private static final ArrayList<AdamTagParentVo> adamTagParentVoArrayList = new ArrayList<>();
     private static final ArrayList<AdamTagVo> adamTagVoArrayList = new ArrayList<>();
+    private static final ArrayList<AdamMemberOrderSimpleVo> adamMemberOrderSimpleVoArrayList = new ArrayList<>();
 
     private static final PagedResult<AdamCollectVo> adamCollectVoPagedResult = new PagedResult<>();
     private static final PagedResult<AdamMemberOrderSimpleVo> adamMemberOrderSimpleVoPagedResult = new PagedResult<>();
@@ -23,6 +23,10 @@ public class ObjectUtil {
         return (ArrayList<AdamTagVo>) adamTagVoArrayList.clone();
     }
 
+    public static ArrayList<AdamMemberOrderSimpleVo> getAdamMemberOrderSimpleVoArrayList() {
+        return (ArrayList<AdamMemberOrderSimpleVo>) adamMemberOrderSimpleVoArrayList.clone();
+    }
+
     public static PagedResult<AdamCollectVo> getAdamCollectVoPagedResult() {
         return adamCollectVoPagedResult.clone();
     }

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

@@ -77,6 +77,7 @@ public class SweetManualShopController {
     @ApiOperation("修改")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualShopId", value = "商铺id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "标题", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "picUrl", value = "图片地址", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "describes", value = "描述", required = true),
@@ -85,13 +86,14 @@ public class SweetManualShopController {
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "sort", value = "排序", required = true),
     })
     public ResponseDto<Boolean> change(@RequestParam String manualShopId,
+                                       @RequestParam String manualId,
                                        @RequestParam String title,
                                        @RequestParam String picUrl,
                                        @RequestParam String describes,
                                        @RequestParam Integer type,
                                        @RequestParam Integer isRecommend,
                                        @RequestParam Integer sort) {
-        return sweetManualShopService.change(manualShopId, title, picUrl, describes, type, isRecommend, sort);
+        return sweetManualShopService.change(manualShopId, manualId, title, picUrl, describes, type, isRecommend, sort);
     }
 
 
@@ -99,8 +101,10 @@ public class SweetManualShopController {
     @ApiOperation("删除")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualShopId", value = "商铺id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
     })
-    public ResponseDto<Boolean> delete(@RequestParam() String manualShopId) {
-        return sweetManualShopService.delete(manualShopId);
+    public ResponseDto<Boolean> delete(@RequestParam() String manualShopId,
+                                       @RequestParam String manualId) {
+        return sweetManualShopService.delete(manualShopId, manualId);
     }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/ISweetManualShopService.java

@@ -22,7 +22,7 @@ public interface ISweetManualShopService extends IService<SweetManualShop> {
 
     ResponseDto<Boolean> add(String manualId,String title,String picUrl,String describe,Integer type,Integer isRecommend,Integer sort);
 
-    ResponseDto<Boolean> change(String manualShopId,String title,String picUrl,String describe,Integer type,Integer isRecommend,Integer sort);
+    ResponseDto<Boolean> change(String manualShopId,String manualId,String title,String picUrl,String describe,Integer type,Integer isRecommend,Integer sort);
 
-    ResponseDto<Boolean> delete(String manualShopId);
+    ResponseDto<Boolean> delete(String manualShopId,String manualId);
 }

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

@@ -10,6 +10,7 @@ import com.liquidnet.service.sweet.entity.SweetManualShop;
 import com.liquidnet.service.sweet.mapper.SweetManualShopMapper;
 import com.liquidnet.service.sweet.service.ISweetManualShopService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.service.sweet.utils.RedisDataUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,6 +30,8 @@ public class SweetManualShopServiceImpl extends ServiceImpl<SweetManualShopMappe
 
     @Autowired
     private SweetManualShopMapper sweetManualShopMapper;
+    @Autowired
+    private RedisDataUtils redisDataUtils;
 
     @Override
     public ResponseDto<List<SweetManualShop>> getList(String manualId, Integer type) {
@@ -64,6 +67,7 @@ public class SweetManualShopServiceImpl extends ServiceImpl<SweetManualShopMappe
             sweetManualShop.setSort(sort);
             sweetManualShop.setStatus(1);
             sweetManualShopMapper.insert(sweetManualShop);
+            redisDataUtils.setManualShopRedisData(manualId);
             return ResponseDto.success();
         } catch (Exception e) {
             e.printStackTrace();
@@ -72,7 +76,7 @@ public class SweetManualShopServiceImpl extends ServiceImpl<SweetManualShopMappe
     }
 
     @Override
-    public ResponseDto<Boolean> change(String manualShopId, String title, String picUrl, String describe, Integer type, Integer isRecommend, Integer sort) {
+    public ResponseDto<Boolean> change(String manualShopId,String manualId, String title, String picUrl, String describe, Integer type, Integer isRecommend, Integer sort) {
         try {
             SweetManualShop sweetManualShop = SweetManualShop.getNew();
             sweetManualShop.setTitle(title);
@@ -82,6 +86,7 @@ public class SweetManualShopServiceImpl extends ServiceImpl<SweetManualShopMappe
             sweetManualShop.setIsRecommend(isRecommend);
             sweetManualShop.setSort(sort);
             sweetManualShopMapper.update(sweetManualShop, Wrappers.lambdaUpdate(SweetManualShop.class).eq(SweetManualShop::getManualShopId, manualShopId));
+            redisDataUtils.setManualShopRedisData(manualId);
             return ResponseDto.success();
         } catch (Exception e) {
             return ResponseDto.failure();
@@ -89,11 +94,12 @@ public class SweetManualShopServiceImpl extends ServiceImpl<SweetManualShopMappe
     }
 
     @Override
-    public ResponseDto<Boolean> delete(String manualShopId) {
+    public ResponseDto<Boolean> delete(String manualShopId,String manualId) {
         try {
             SweetManualShop sweetManualShop = SweetManualShop.getNew();
             sweetManualShop.setStatus(0);
             sweetManualShopMapper.update(sweetManualShop, Wrappers.lambdaUpdate(SweetManualShop.class).eq(SweetManualShop::getManualShopId, manualShopId));
+            redisDataUtils.setManualShopRedisData(manualId);
             return ResponseDto.success();
         } catch (Exception e) {
             return ResponseDto.failure();