回收站类目价格功能开发v1

nxhs-common/src/main/java/cc/yunxi/common/domain/PageQuery.java

@@ -69,6 +69,7 @@ public class PageQuery<T> {
             throw new RuntimeException(e);
         }
         orderItem.setAsc(isAsc);
+        orderItems.add(orderItem);
         return this;
     }
 

nxhs-service/src/main/java/cc/yunxi/controller/RecycleStationController.java

@@ -8,6 +8,7 @@ import cc.yunxi.common.utils.BeanUtils;
 import cc.yunxi.domain.dto.LocationDTO;
 import cc.yunxi.domain.po.RecycleStation;
 import cc.yunxi.domain.query.RecycleStationQuery;
+import cc.yunxi.domain.vo.recyclestation.ProductRespVO;
 import cc.yunxi.domain.vo.recyclestation.RecycleStationRespVO;
 import cc.yunxi.service.IRecycleStationService;
 import cn.hutool.core.util.ObjectUtil;
@@ -18,6 +19,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -52,16 +55,18 @@ public class RecycleStationController {
 
     @ApiOperation("回收站详情")
     @GetMapping("/info")
-    public CommonResult<RecycleStationRespVO> findOrder(@RequestBody RecycleStationQuery recycleStationQuery) {
+    public CommonResult<RecycleStationRespVO> stationInfo(@RequestParam("stationId") String stationId) {
-        RecycleStation station = recycleStationService.getStationById(recycleStationQuery.getStationId());
+        RecycleStation station = recycleStationService.getStationById(stationId);
         RecycleStationRespVO recycleStationRespVO = BeanUtils.copyBean(station, RecycleStationRespVO.class);
-        // 站点距离计算
-        LocationDTO locationDTO = recycleStationQuery.getLocation();
-        log.info("client locationDTO: {}", locationDTO);
-        if (ObjectUtil.isEmpty(locationDTO)) {
-            throw new BizIllegalException("授权定位信息未授权");
-        }
         return CommonResult.success(recycleStationRespVO);
     }
 
+
+    @ApiOperation("回收站废品价格类目")
+    @GetMapping("/price-product")
+    public CommonResult<List<ProductRespVO>> stationProduct(@RequestParam("stationId") String stationId) {
+        List<ProductRespVO> stationProduct = recycleStationService.getStationProduct(stationId);
+        return CommonResult.success(stationProduct);
+    }
+
 }

nxhs-service/src/main/java/cc/yunxi/domain/po/Price.java

@@ -0,0 +1,58 @@
+package cc.yunxi.domain.po;
+
+import cc.yunxi.enums.GlobalStatusEnum;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 价目表
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-03-08 01:37:49
+ */
+@Data
+@TableName("nx_price")
+@ApiModel(value = "Price", description = "价格表")
+public class Price {
+
+    @ApiModelProperty("主键id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty("价格编号")
+    @TableField("price_code")
+    private String priceCode;
+
+//    @ApiModelProperty("报价方id(登录人所在商户id)")
+//    @TableField("buiness_id")
+//    private String buinessId;
+
+//    @ApiModelProperty("价格类型(1：回收价)")
+//    @TableField("price_type")
+//    private String priceType;
+
+    @ApiModelProperty("状态：1生效，2失效")
+    @TableField("status")
+    private GlobalStatusEnum status;
+
+    @ApiModelProperty("备注")
+    @TableField("remak")
+    private String remak;
+
+    @ApiModelProperty("创建时间")
+    @TableField("f_creator_time")
+    private LocalDateTime fCreatorTime;
+
+}

nxhs-service/src/main/java/cc/yunxi/domain/po/PriceProduct.java

@@ -0,0 +1,53 @@
+package cc.yunxi.domain.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 价格废品关联表
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-03-08 01:47:39
+ */
+@Data
+@TableName("nx_price_product")
+@ApiModel(value = "PriceProduct", description = "价格废品关联信息")
+public class PriceProduct {
+
+    @ApiModelProperty("主键id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty("价格id")
+    @TableField("price_id")
+    private String priceId;
+
+    @ApiModelProperty("废品id")
+    @TableField("product_id")
+    private String productId;
+
+    @ApiModelProperty("回收价")
+    @TableField("recovery_price")
+    private BigDecimal recoveryPrice;
+
+    @ApiModelProperty("赠送积分")
+    @TableField("reward_points")
+    private String rewardPoints;
+
+    @ApiModelProperty("创建时间")
+    @TableField("f_creator_time")
+    private LocalDateTime fCreatorTime;
+
+}

nxhs-service/src/main/java/cc/yunxi/domain/po/Product.java

@@ -0,0 +1,57 @@
+package cc.yunxi.domain.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 废品表
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-03-08 01:52:54
+ */
+@Data
+@TableName("nx_product")
+@ApiModel(value = "Product对象", description = "商品回收类目")
+public class Product {
+
+    @ApiModelProperty("主键id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty("编码")
+    @TableField("code")
+    private String code;
+
+    @ApiModelProperty("名称")
+    @TableField("name")
+    private String name;
+
+    @ApiModelProperty("规格")
+    @TableField("spec")
+    private String spec;
+
+    @ApiModelProperty("库存单位")
+    @TableField("unit")
+    private String unit;
+
+    @ApiModelProperty("备注")
+    @TableField("remak")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    @TableField("f_creator_time")
+    private LocalDateTime fCreatorTime;
+
+}

nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleStationPrice.java

@@ -0,0 +1,46 @@
+package cc.yunxi.domain.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 回收站价目表
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-03-08 01:41:56
+ */
+@Getter
+@Setter
+@TableName("nx_price_recycle")
+@ApiModel(value = "RecycleStationPrice", description = "回收站价目表")
+public class RecycleStationPrice {
+
+    @ApiModelProperty("主键Id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty("价目id")
+    @TableField("price_id")
+    private String priceId;
+
+    @ApiModelProperty("回收站id")
+    @TableField("recycle_id")
+    private String recycleStationId;
+
+    @ApiModelProperty("创建时间")
+    @TableField("f_creator_time")
+    private LocalDateTime fCreatorTime;
+
+
+}

nxhs-service/src/main/java/cc/yunxi/domain/vo/recyclestation/ProductRespVO.java

@@ -0,0 +1,67 @@
+package cc.yunxi.domain.vo.recyclestation;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 废品价目 VO
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-03-01 11:15:39
+ */
+@ApiModel(description = "回收站 Response VO")
+@Data
+@Accessors(chain = true)
+public class ProductRespVO {
+
+    @ApiModelProperty("价格id")
+    @TableField("price_id")
+    private String priceId;
+
+    @ApiModelProperty("废品id")
+    @TableField("product_id")
+    private String productId;
+
+    @ApiModelProperty("回收价")
+    @TableField("recovery_price")
+    private BigDecimal recoveryPrice;
+
+    @ApiModelProperty("赠送积分")
+    @TableField("reward_points")
+    private String rewardPoints;
+
+    @ApiModelProperty("废品编码")
+    @TableField("code")
+    private String code;
+
+    @ApiModelProperty("废品名称")
+    @TableField("name")
+    private String name;
+
+    @ApiModelProperty("废品规格")
+    @TableField("spec")
+    private String spec;
+
+    @ApiModelProperty("废品单位")
+    @TableField("unit")
+    private String unit;
+
+    @ApiModelProperty("备注")
+    @TableField("remak")
+    private String remark;
+
+    @ApiModelProperty("废品定价时间")
+    @TableField("f_creator_time")
+    private LocalDateTime fCreatorTime;
+}

nxhs-service/src/main/java/cc/yunxi/enums/GlobalStatusEnum.java

@@ -0,0 +1,22 @@
+package cc.yunxi.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 全局状态枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum GlobalStatusEnum {
+
+    VALID("1", "启用"),
+
+    INVALID("2", "禁用");
+
+    @EnumValue
+    private final String code;
+
+    private final String desc;
+}

nxhs-service/src/main/java/cc/yunxi/mapper/PriceMapper.java

@@ -0,0 +1,18 @@
+package cc.yunxi.mapper;
+
+import cc.yunxi.domain.po.Price;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 价目表 Mapper 接口
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-03-08 01:37:49
+ */
+@Mapper
+public interface PriceMapper extends BaseMapper<Price> {
+
+}

nxhs-service/src/main/java/cc/yunxi/mapper/PriceProductMapper.java

@@ -0,0 +1,18 @@
+package cc.yunxi.mapper;
+
+import cc.yunxi.domain.po.PriceProduct;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 价目废品关联 Mapper 接口
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-03-08 01:47:39
+ */
+@Mapper
+public interface PriceProductMapper extends BaseMapper<PriceProduct> {
+
+}

nxhs-service/src/main/java/cc/yunxi/mapper/ProductMapper.java

@@ -0,0 +1,18 @@
+package cc.yunxi.mapper;
+
+import cc.yunxi.domain.po.Product;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 废品 Mapper 接口
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-03-08 01:52:54
+ */
+@Mapper
+public interface ProductMapper extends BaseMapper<Product> {
+
+}

nxhs-service/src/main/java/cc/yunxi/mapper/RecycleStationPriceMapper.java

@@ -0,0 +1,18 @@
+package cc.yunxi.mapper;
+
+import cc.yunxi.domain.po.RecycleStationPrice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 回收站价目关联 Mapper 接口
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-03-08 01:41:56
+ */
+@Mapper
+public interface RecycleStationPriceMapper extends BaseMapper<RecycleStationPrice> {
+
+}

nxhs-service/src/main/java/cc/yunxi/service/IPriceService.java

@@ -0,0 +1,16 @@
+package cc.yunxi.service;
+
+import cc.yunxi.domain.po.Price;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 价目表 服务类
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-03-08 01:37:49
+ */
+public interface IPriceService extends IService<Price> {
+
+}

nxhs-service/src/main/java/cc/yunxi/service/IRecycleStationService.java

@@ -3,12 +3,15 @@ package cc.yunxi.service;
 import cc.yunxi.domain.po.RecycleOrder;
 import cc.yunxi.domain.po.RecycleStation;
 import cc.yunxi.domain.query.RecycleStationQuery;
+import cc.yunxi.domain.vo.recyclestation.ProductRespVO;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
- * 企业-回收站信息 服务类
+ * 回收站信息 服务类
  * </p>
  *
  * @author ccongli
@@ -26,10 +29,18 @@ public interface IRecycleStationService extends IService<RecycleStation> {
 
 
     /**
-     * 订单详情
+     * 站点详情
      * @param id
      * @return RecycleOrder
      */
     RecycleStation getStationById(String id);
 
+
+    /**
+     * 站点废品价目信息
+     * @param stationId
+     * @return RecycleOrder
+     */
+    List<ProductRespVO> getStationProduct(String stationId);
+
 }

nxhs-service/src/main/java/cc/yunxi/service/impl/PriceServiceImpl.java

@@ -0,0 +1,20 @@
+package cc.yunxi.service.impl;
+
+import cc.yunxi.domain.po.Price;
+import cc.yunxi.mapper.PriceMapper;
+import cc.yunxi.service.IPriceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 价目表 服务实现类
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-03-08 01:37:49
+ */
+@Service
+public class PriceServiceImpl extends ServiceImpl<PriceMapper, Price> implements IPriceService {
+
+}

nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleStationServiceImpl.java

@@ -2,22 +2,32 @@ package cc.yunxi.service.impl;
 
 import cc.yunxi.common.domain.LambdaQueryWrapperX;
 import cc.yunxi.common.exception.BizIllegalException;
-import cc.yunxi.domain.po.Client;
+import cc.yunxi.common.utils.BeanUtils;
-import cc.yunxi.domain.po.RecycleOrder;
+import cc.yunxi.domain.po.*;
-import cc.yunxi.domain.po.RecycleStation;
 import cc.yunxi.domain.query.RecycleOrderQuery;
 import cc.yunxi.domain.query.RecycleStationQuery;
-import cc.yunxi.mapper.RecycleStationMapper;
+import cc.yunxi.domain.vo.recyclestation.ProductRespVO;
+import cc.yunxi.enums.GlobalStatusEnum;
+import cc.yunxi.mapper.*;
 import cc.yunxi.service.IRecycleStationService;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
@@ -34,7 +44,17 @@ public class RecycleStationServiceImpl extends ServiceImpl<RecycleStationMapper,
     @Resource
     private RecycleStationMapper recycleStationMapper;
 
+    @Resource
+    private RecycleStationPriceMapper recycleStationPriceMapper;
+    @Resource
+    private PriceMapper priceMapper;
+    @Resource
+    private PriceProductMapper priceProductMapper;
+    @Resource
+    private ProductMapper productMapper;
+
 
+    @Override
     public Page<RecycleStation> queryStationByPage(RecycleStationQuery recycleStationQuery) {
         LambdaQueryWrapperX<RecycleStation> wrapperX = new LambdaQueryWrapperX<>();
         wrapperX.eqIfPresent(RecycleStation::getStationName, recycleStationQuery.getStationName());
@@ -43,6 +63,7 @@ public class RecycleStationServiceImpl extends ServiceImpl<RecycleStationMapper,
     }
 
 
+    @Override
     public RecycleStation getStationById(String id) {
         if (StrUtil.isEmpty(id)) {
             throw new BizIllegalException("请求参数缺失");
@@ -54,4 +75,41 @@ public class RecycleStationServiceImpl extends ServiceImpl<RecycleStationMapper,
         return recycleStation;
     }
 
+
+    @Override
+    public List<ProductRespVO> getStationProduct(String stationId) {
+        RecycleStationPrice recycleStationPrice = new LambdaQueryChainWrapper<>(recycleStationPriceMapper)
+                .eq(RecycleStationPrice::getRecycleStationId, stationId).one();
+        if (ObjectUtil.isEmpty(recycleStationPrice)) {
+            throw new BizIllegalException("回收站点价目信息未配置");
+        }
+        Price price = new LambdaQueryChainWrapper<>(priceMapper).eq(Price::getId, recycleStationPrice.getPriceId()).one();
+        if (ObjectUtil.isEmpty(price) || GlobalStatusEnum.INVALID.equals(price.getStatus())) {
+            throw new BizIllegalException("价目配置不存在或被禁用");
+        }
+        List<ProductRespVO> productRespVOList = new ArrayList<>(20);
+        List<PriceProduct> priceProductList = new LambdaQueryChainWrapper<>(priceProductMapper)
+                .eq(PriceProduct::getPriceId, price.getId()).list();
+        if (CollectionUtil.isNotEmpty(priceProductList)) {
+            // 获取废品价格信息
+            Map<String, PriceProduct> priceProductMap = priceProductList.stream()
+                    .collect(Collectors.toMap(PriceProduct::getProductId, p -> p, (k1, k2) -> k1));
+            if (CollectionUtil.isNotEmpty(priceProductMap)) {
+                List<Product> productList = new LambdaQueryChainWrapper<>(productMapper)
+                        .in(Product::getId, priceProductMap.keySet()).list();
+                for (Product product : productList) {
+                    PriceProduct priceProduct = priceProductMap.get(product.getId());
+                    ProductRespVO productRespVO = BeanUtils.copyBean(priceProduct, ProductRespVO.class);
+                    productRespVO.setCode(product.getCode())
+                            .setName(product.getName())
+                            .setSpec(product.getSpec())
+                            .setUnit(product.getUnit())
+                            .setRemark(product.getRemark());
+                    productRespVOList.add(productRespVO);
+                }
+            }
+        }
+        return productRespVOList;
+    }
+
 }

nxhs-service/src/main/resources/mapper/PriceMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cc.yunxi.mapper.PriceMapper">
+
+</mapper>

nxhs-service/src/main/resources/mapper/PriceProductMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cc.yunxi.mapper.PriceProductMapper">
+
+</mapper>

nxhs-service/src/main/resources/mapper/PriceRecycleMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cc.yunxi.mapper.PriceRecycleMapper">
+
+</mapper>

nxhs-service/src/main/resources/mapper/ProductMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cc.yunxi.mapper.ProductMapper">
+
+</mapper>

nxhs-service/src/main/resources/mapper/RecycleStationMapper.xml

@@ -17,7 +17,7 @@
         HAVING
             distance <= a.accept_range
         ORDER BY
-            distance ASC;
+            distance ASC
     </select>
 
 </mapper>