藏品详情加上是否为官方商品的字段

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/SysExchangeApplyOrderController.java

+package com.wwdz.ch.admin.controller;
+
+
+import com.alibaba.fastjson.JSON;
+import com.wwdz.ch.admin.service.SysExchangeApplyOrderService;
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dto.request.exchange.ExchangeApplyOrderRequestDto;
+import com.xxdxxs.service.FormHandler;
+import com.xxdxxs.validation.Validator;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/admin/exchangeApplyOrder")
+public class SysExchangeApplyOrderController {
+
+    private static final Logger logger = LoggerFactory.getLogger(SysExchangeApplyOrderController.class);
+
+
+    @Autowired
+    SysExchangeApplyOrderService sysExchangeApplyOrderService;
+
+
+
+    @ApiOperation(value = "平台审核申请单")
+    @PostMapping("/handleApplyOrder")
+    public Result handleApplyOrder(@RequestBody ExchangeApplyOrderRequestDto dto) {
+        logger.info("处理申请单,请求参数:{}", JSON.toJSONString(dto));
+        Validator validator = new Validator(FormHandler.ofEntity(dto));
+        validator.set("exchangeApplyOrderId", "交换申请单号").must().string()
+                .set("state", "状态").must().number()
+                .end();
+        if (!validator.isValid()) {
+            return Result.failed(validator.getErrorInfo());
+        }
+        return sysExchangeApplyOrderService.handleApplyOrder(dto);
+    }
+
+
+
+    @ApiOperation(value = "查询交换单列表")
+    @PostMapping("/findList")
+    public Result findList(@RequestBody ExchangeApplyOrderRequestDto dto) {
+        logger.info("查询交换单列表,请求参数:{}", JSON.toJSONString(dto));
+        return sysExchangeApplyOrderService.findList(dto);
+    }
+
+
+    @ApiOperation(value = "查询交换单详情")
+    @PostMapping("/findDetail")
+    public Result findDetail(@RequestBody ExchangeApplyOrderRequestDto dto) {
+        logger.info("查询交换单详情,请求参数:{}", JSON.toJSONString(dto));
+        Validator validator = new Validator(FormHandler.ofEntity(dto));
+        validator.set("exchangeApplyOrderId", "交换申请单号").must().string()
+                .end();
+        if (!validator.isValid()) {
+            return Result.failed(validator.getErrorInfo());
+        }
+        return sysExchangeApplyOrderService.findDetail(dto);
+    }
+
+}

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysExchangeApplyOrderServiceImpl.java

+package com.wwdz.ch.admin.impl;
+
+import com.github.pagehelper.PageInfo;
+import com.wwdz.ch.admin.service.SysExchangeApplyOrderService;
+import com.wwdz.ch.core.consts.DistributionEnum;
+import com.wwdz.ch.core.consts.ExchangeApplyOrderEnum;
+import com.wwdz.ch.core.entity.SupplierItemVo;
+import com.wwdz.ch.core.entity.exchange.ExchangeApplyOrderVo;
+import com.wwdz.ch.core.type.PageSearchResult;
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.core.util.CacheUtil;
+import com.wwdz.ch.core.util.MediaUtil;
+import com.wwdz.ch.core.util.PriceUtil;
+import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
+import com.wwdz.ch.db.dao.distribution.ExchangeOrderSnapshotDao;
+import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
+import com.wwdz.ch.db.dao.exchange.ExchangeApplyOrderDao;
+import com.wwdz.ch.db.dao.exchange.ExchangeApplyOrderDetailDao;
+import com.wwdz.ch.db.domain.distribution.*;
+import com.wwdz.ch.db.dto.request.exchange.ExchangeApplyOrderRequestDto;
+import com.xxdxxs.utils.EntityMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+@Service
+public class SysExchangeApplyOrderServiceImpl implements SysExchangeApplyOrderService {
+
+    private static final Logger logger = LoggerFactory.getLogger(SysExchangeApplyOrderServiceImpl.class);
+
+    @Autowired
+    ExchangeApplyOrderDetailDao exchangeApplyOrderDetailDao;
+
+    @Autowired
+    ExchangeApplyOrderDao exchangeApplyOrderDao;
+
+    @Autowired
+    SupplierItemDao supplierItemDao;
+
+    @Autowired
+    ExchangeOrderSnapshotDao exchangeOrderSnapshotDao;
+
+    @Autowired
+    CacheUtil cacheUtil;
+
+    @Autowired
+    DistributionOrderDao distributionOrderDao;
+
+
+    @Transactional
+    @Override
+    public Result handleApplyOrder(ExchangeApplyOrderRequestDto dto) {
+        try {
+            String orderId = dto.getExchangeApplyOrderId();
+            ExchangeApplyOrder exchangeApplyOrder = exchangeApplyOrderDao.findByOrderId(orderId);
+            String targetUserOrderId = exchangeApplyOrder.getTargetUserOrderId();
+            String userOrderId = exchangeApplyOrder.getUserOrderId();
+            //平台通过申请单
+            if (dto.getState() == ExchangeApplyOrderEnum.StateEnum.SYSTEM_AGREE.getCode()) {
+                exchangeApplyOrderDao.updateState(orderId, dto.getState());
+                //订单更新为待发货
+                distributionOrderDao.updateState(targetUserOrderId, DistributionEnum.DistributionOrderStateEnum.PRE_SEND.getCode());
+                distributionOrderDao.updateState(userOrderId, DistributionEnum.DistributionOrderStateEnum.PRE_SEND.getCode());
+            } else {
+                //平台审核不通过
+                exchangeApplyOrderDao.updateState(orderId, dto.getState());
+                exchangeApplyOrderDetailDao.updateInValid(orderId);
+                distributionOrderDao.updateState(targetUserOrderId, DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode());
+                distributionOrderDao.updateState(userOrderId, DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode());
+                //被交换的商品库存恢复
+                DistributionOrder distributionOrder = distributionOrderDao.findById(userOrderId);
+                SupplierItem exchangeItem = supplierItemDao.findById(distributionOrder.getItemId());
+                int oldStock = exchangeItem.getStock();
+                int newStock = oldStock + distributionOrder.getItemNum();
+                supplierItemDao.updateStock(distributionOrder.getItemId(), newStock);
+
+                //查询交换订单商品快照
+                List<ExchangeOrderSnapshot> list = exchangeOrderSnapshotDao.findByOrderId(userOrderId);
+                for (ExchangeOrderSnapshot exchangeOrderSnapshot : list) {
+                    //恢复用户交换商品的库存
+                    SupplierItem supplierItem = supplierItemDao.findById(exchangeOrderSnapshot.getItemId());
+                    //当前库存
+                    int currentStock = supplierItem.getStock();
+                    int updateStock = currentStock + exchangeOrderSnapshot.getItemNum();
+                    supplierItemDao.updateStock(exchangeOrderSnapshot.getItemId(), updateStock);
+                }
+
+                //双方的订单快照都设置为无效
+                ExchangeOrderSnapshot userOrderSnapshot = new ExchangeOrderSnapshot();
+                userOrderSnapshot.setDistributionOrderId(userOrderId);
+                userOrderSnapshot.setIsValid(false);
+                exchangeOrderSnapshotDao.update(userOrderSnapshot);
+
+                ExchangeOrderSnapshot targetOrderSnapshot = new ExchangeOrderSnapshot();
+                targetOrderSnapshot.setDistributionOrderId(targetUserOrderId);
+                targetOrderSnapshot.setIsValid(false);
+                exchangeOrderSnapshotDao.update(targetOrderSnapshot);
+            }
+            return Result.success();
+        } catch (Exception e) {
+            logger.error("平台处理换物申请单 error:{}", e);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+        return Result.failed();
+    }
+
+
+
+    @Override
+    public Result findList(ExchangeApplyOrderRequestDto dto) {
+        try {
+            List<ExchangeApplyOrder> exchangeApplyOrderList = exchangeApplyOrderDao.findByPage(dto);
+            PageInfo pageInfo = new PageInfo<>(exchangeApplyOrderList);
+            List<ExchangeApplyOrderVo> exchangeApplyOrderVoList = new ArrayList<>();
+            for (ExchangeApplyOrder exchangeApplyOrder : exchangeApplyOrderList) {
+                ExchangeApplyOrderVo exchangeApplyOrderVo = new ExchangeApplyOrderVo();
+                EntityMapper.copyAttribute(exchangeApplyOrder, exchangeApplyOrderVo);
+                //交换的目标商品
+                long targetItemId = exchangeApplyOrder.getTargetItemId();
+                SupplierItem targetItem = supplierItemDao.findById(targetItemId);
+                SupplierItemVo targetItemVo = new SupplierItemVo();
+                EntityMapper.copyAttribute(targetItem, targetItemVo);
+                targetItemVo.setItemId(targetItemId);
+                targetItemVo.setName(targetItem.getName());
+                targetItemVo.setItemNum(exchangeApplyOrder.getTargetItemNum());
+                targetItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(targetItem.getDistributionPrice()));
+                targetItemVo.setOfficialEstimatedPrice(PriceUtil.convertPriceFenToYuan(targetItem.getOfficialEstimatedPrice()));
+                targetItemVo.setHomePageImage(MediaUtil.getHomePageImage(targetItem.getImages(), targetItem.getVideos()));
+                exchangeApplyOrderVo.setTargetItemInfo(targetItemVo);
+
+                List<ExchangeApplyOrderDetail> detailList = exchangeApplyOrderDetailDao.findByOrderId(exchangeApplyOrder.getExchangeApplyOrderId());
+                List<SupplierItemVo> userItemList = new ArrayList<>();
+                //用户用来交换的商品
+                for (ExchangeApplyOrderDetail exchangeApplyOrderDetail : detailList) {
+                    SupplierItem supplierItem = supplierItemDao.findById(exchangeApplyOrderDetail.getItemId());
+                    SupplierItemVo supplierItemVo = new SupplierItemVo();
+                    supplierItemVo.setItemId(exchangeApplyOrderDetail.getItemId());
+                    supplierItemVo.setName(supplierItem.getName());
+                    supplierItemVo.setItemNum(exchangeApplyOrderDetail.getItemNum());
+                    supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
+                    supplierItemVo.setOfficialEstimatedPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getOfficialEstimatedPrice()));
+                    supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
+                    userItemList.add(supplierItemVo);
+                }
+                exchangeApplyOrderVo.setUserItemList(userItemList);
+            }
+            return Result.success(PageSearchResult.of(pageInfo, exchangeApplyOrderVoList));
+        } catch (Exception e) {
+            logger.error("查询交换单列表 error:{}", e);
+        }
+        return Result.failed();
+    }
+
+
+    @Override
+    public Result findDetail(ExchangeApplyOrderRequestDto dto) {
+        try {
+            ExchangeApplyOrder exchangeApplyOrder = exchangeApplyOrderDao.findByOrderId(dto.getExchangeApplyOrderId());
+            ExchangeApplyOrderVo exchangeApplyOrderVo = new ExchangeApplyOrderVo();
+            EntityMapper.copyAttribute(exchangeApplyOrder, exchangeApplyOrderVo);
+            //交换的目标商品
+            long targetItemId = exchangeApplyOrder.getTargetItemId();
+            SupplierItem targetItem = supplierItemDao.findById(targetItemId);
+            SupplierItemVo targetItemVo = new SupplierItemVo();
+            EntityMapper.copyAttribute(targetItem, targetItemVo);
+            targetItemVo.setItemId(targetItemId);
+            targetItemVo.setName(targetItem.getName());
+            targetItemVo.setItemNum(exchangeApplyOrder.getTargetItemNum());
+            targetItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(targetItem.getDistributionPrice()));
+            targetItemVo.setOfficialEstimatedPrice(PriceUtil.convertPriceFenToYuan(targetItem.getOfficialEstimatedPrice()));
+            targetItemVo.setHomePageImage(MediaUtil.getHomePageImage(targetItem.getImages(), targetItem.getVideos()));
+            targetItemVo.setCreatorName(cacheUtil.getAppletUserNameById(targetItem.getCreatorId()));
+            exchangeApplyOrderVo.setTargetItemInfo(targetItemVo);
+
+            List<ExchangeApplyOrderDetail> detailList = exchangeApplyOrderDetailDao.findByOrderId(exchangeApplyOrder.getExchangeApplyOrderId());
+            List<SupplierItemVo> userItemList = new ArrayList<>();
+            //用户用来交换的商品
+            for (ExchangeApplyOrderDetail exchangeApplyOrderDetail : detailList) {
+                SupplierItem supplierItem = supplierItemDao.findById(exchangeApplyOrderDetail.getItemId());
+                SupplierItemVo supplierItemVo = new SupplierItemVo();
+                supplierItemVo.setItemId(exchangeApplyOrderDetail.getItemId());
+                supplierItemVo.setName(supplierItem.getName());
+                supplierItemVo.setItemNum(exchangeApplyOrderDetail.getItemNum());
+                supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
+                supplierItemVo.setOfficialEstimatedPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getOfficialEstimatedPrice()));
+                supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
+                userItemList.add(supplierItemVo);
+            }
+            exchangeApplyOrderVo.setUserItemList(userItemList);
+            return Result.success(exchangeApplyOrderVo);
+        } catch (Exception e) {
+            logger.error("查询交换单详情 error:{}", e);
+        }
+        return Result.failed();
+    }
+}

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/SysExchangeApplyOrderService.java

+package com.wwdz.ch.admin.service;
+
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dto.request.exchange.ExchangeApplyOrderRequestDto;
+
+public interface SysExchangeApplyOrderService {
+
+
+    /**
+     * 处理申请单
+     * @param dto
+     * @return
+     */
+    Result handleApplyOrder(ExchangeApplyOrderRequestDto dto);
+
+
+    /**
+     * 查询交换单列表
+     * @param dto
+     * @return
+     */
+    Result findList(ExchangeApplyOrderRequestDto dto);
+
+
+
+    /**
+     * 查询交换单详情
+     * @param dto
+     * @return
+     */
+    Result findDetail(ExchangeApplyOrderRequestDto dto);
+}

ch-core/src/main/java/com/wwdz/ch/core/consts/ExchangeApplyOrderEnum.java

@@ -6,7 +6,8 @@ public class ExchangeApplyOrderEnum {
         PRE_HANDLE(0, "待处理"),
         AGREE(1, "同意"),
         DISAGREE(2, "拒绝"),
-        SYSTEM_DISAGREE(3, "平台鉴定后拒绝"),
+        SYSTEM_AGREE(3, "平台鉴定后通过"),
+        SYSTEM_DISAGREE(4, "平台鉴定后拒绝"),
         CANCEL(-1, "取消"),
         ;
 

ch-core/src/main/java/com/wwdz/ch/core/entity/exchange/ExchangeApplyOrderVo.java

@@ -28,7 +28,7 @@ public class ExchangeApplyOrderVo implements Entity {
     /**
      * 想要换的目标商品id
      */
-    private SupplierItemVo targetItemInfo;
+    private List<SupplierItemVo> targetItemList;
 
     /**
      * 目标用户id

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/ExchangeApplyOrderServiceImpl.java

@@ -34,16 +34,13 @@ import org.springframework.util.CollectionUtils;
 
 import java.time.Duration;
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
 public class ExchangeApplyOrderServiceImpl implements ExchangeApplyOrderService {
 
-    private static final Logger logger = LoggerFactory.getLogger(DistributorProfitServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(ExchangeApplyOrderServiceImpl.class);
 
     @Autowired
     ExchangeApplyOrderDetailDao exchangeApplyOrderDetailDao;
@@ -252,7 +249,7 @@ public class ExchangeApplyOrderServiceImpl implements ExchangeApplyOrderService
                 targetItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(targetItem.getDistributionPrice()));
                 targetItemVo.setOfficialEstimatedPrice(PriceUtil.convertPriceFenToYuan(targetItem.getOfficialEstimatedPrice()));
                 targetItemVo.setHomePageImage(MediaUtil.getHomePageImage(targetItem.getImages(), targetItem.getVideos()));
-                exchangeApplyOrderVo.setTargetItemInfo(targetItemVo);
+                exchangeApplyOrderVo.setTargetItemList(Arrays.asList(targetItemVo));
 
                 List<ExchangeApplyOrderDetail> detailList = exchangeApplyOrderDetailDao.findByOrderId(exchangeApplyOrder.getExchangeApplyOrderId());
                 List<SupplierItemVo> userItemList = new ArrayList<>();
@@ -310,7 +307,7 @@ public class ExchangeApplyOrderServiceImpl implements ExchangeApplyOrderService
             targetItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(targetItem.getDistributionPrice()));
             targetItemVo.setOfficialEstimatedPrice(PriceUtil.convertPriceFenToYuan(targetItem.getOfficialEstimatedPrice()));
             targetItemVo.setHomePageImage(MediaUtil.getHomePageImage(targetItem.getImages(), targetItem.getVideos()));
-            exchangeApplyOrderVo.setTargetItemInfo(targetItemVo);
+            exchangeApplyOrderVo.setTargetItemList(Arrays.asList(targetItemVo));
 
             List<ExchangeApplyOrderDetail> detailList = exchangeApplyOrderDetailDao.findByOrderId(exchangeApplyOrder.getExchangeApplyOrderId());
             List<SupplierItemVo> userItemList = new ArrayList<>();

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java

@@ -1020,6 +1020,10 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             String shareTip = "分享藏品，成交最高可得3%(" + PriceUtil.convertDoubleToString(introduceCost ) + ")的介绍佣金";
             supplierItemVo.setShareTip(shareTip);
 
+            if (CommConsts.SELF_SUPPORT_ACCOUNT.longValue() == supplierItem.getCreatorId()) {
+                supplierItemVo.setIsOfficialItem(true);
+            }
+
             //查询商品所属标签
             List<CollectionItemsRelation> collectionItemsRelations = collectionItemsRelationDao.findByItemId(itemId);
             List<Long> collectBookIds = collectionItemsRelations.stream().map(CollectionItemsRelation::getCollectionBookId).collect(Collectors.toList());

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/distribution/ExchangeApplyOrderController.java

@@ -60,7 +60,7 @@ public class ExchangeApplyOrderController {
     @ApiOperation(value = "用户取消交换申请")
     @PostMapping("/cancel")
     public Result cancel(@RequestBody ExchangeApplyOrderRequestDto dto) {
-        logger.info("用户申请以物换物,请求参数:{}", JSON.toJSONString(dto));
+        logger.info("用户取消交换申请,请求参数:{}", JSON.toJSONString(dto));
         Validator validator = new Validator(FormHandler.ofEntity(dto));
         validator.set("exchangeApplyOrderId", "交换申请单号").must().string()
                 .end();
@@ -74,7 +74,7 @@ public class ExchangeApplyOrderController {
     @ApiOperation(value = "查询交换单列表")
     @PostMapping("/findList")
     public Result findList(@RequestBody ExchangeApplyOrderRequestDto dto) {
-        logger.info("用户申请以物换物,请求参数:{}", JSON.toJSONString(dto));
+        logger.info("查询交换单列表,请求参数:{}", JSON.toJSONString(dto));
         Validator validator = new Validator(FormHandler.ofEntity(dto));
         validator.set("userId", "用户ID").must().number()
                 .set("type", "类型").must().number()