fix

yami-shop-bean/src/main/java/com/yami/shop/bean/po/FreightStatisticsPo.java

@@ -0,0 +1,42 @@
+
+package com.yami.shop.bean.po;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FreightStatisticsPo {
+
+    @ApiModelProperty("企业ids")
+    private List<Long> channelIds;
+
+    @ApiModelProperty("收货人")
+    private String receiver;
+
+    @ApiModelProperty("收货人手机号")
+    private String mobile;
+
+    @ApiModelProperty("运输公司")
+    private String delivery;
+
+    @ApiModelProperty("运单号")
+    private String deliveryNo;
+
+    @ApiModelProperty("到件地址")
+    private String toAddress;
+
+    @ApiModelProperty("订/退单号")
+    private String orderNo;
+
+    @ApiModelProperty("开始时间")
+    private String startTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+}

yami-shop-bean/src/main/java/com/yami/shop/bean/po/SkuStatisticsPo.java

@@ -0,0 +1,33 @@
+
+package com.yami.shop.bean.po;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SkuStatisticsPo {
+
+    @ApiModelProperty("企业ids")
+    private List<Long> channelIds;
+
+    @ApiModelProperty("skuId")
+    private Long skuId;
+
+    @ApiModelProperty("skuName")
+    private String skuName;
+
+    @ApiModelProperty("规格")
+    private String spec;
+
+    @ApiModelProperty("开始时间")
+    private String startTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+}

yami-shop-bean/src/main/java/com/yami/shop/bean/vo/FreightStatisticsVo.java

@@ -0,0 +1,46 @@
+
+package com.yami.shop.bean.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FreightStatisticsVo {
+
+    @ApiModelProperty("日期")
+    @DateTimeFormat(pattern="yyyy/MM/dd")
+    private Date date;
+
+    @ApiModelProperty("寄方")
+    private String sendSize;
+
+    @ApiModelProperty("收方")
+    private String receiver;
+
+    @ApiModelProperty("运输公司")
+    private String delivery;
+
+    @ApiModelProperty("运单号")
+    private String deliveryNo;
+
+    @ApiModelProperty("寄件地区")
+    private String sendArea;
+
+    @ApiModelProperty("到件地址")
+    private String toAddress;
+
+    @ApiModelProperty("费用")
+    private String money;
+
+    @ApiModelProperty("订/退单号")
+    private String orderNo;
+
+
+}

yami-shop-bean/src/main/java/com/yami/shop/bean/vo/IdNameVo.java

@@ -0,0 +1,17 @@
+
+package com.yami.shop.bean.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class IdNameVo {
+
+    private Long id;
+
+    private String name;
+
+}

yami-shop-bean/src/main/java/com/yami/shop/bean/vo/SkuStatistics.java

@@ -0,0 +1,31 @@
+
+package com.yami.shop.bean.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SkuStatistics {
+
+    @ApiModelProperty("商品总额")
+    private Double goodsTotalPrice;
+
+    @ApiModelProperty("积分抵扣")
+    private Double totalPoints;
+
+    @ApiModelProperty("现金抵扣")
+    private Double totalCash;
+
+    @ApiModelProperty("运费")
+    private Double totalFreight;
+
+    @ApiModelProperty("sku")
+    private List<SkuStatisticsVo> skuStatisticsList;
+
+}

yami-shop-bean/src/main/java/com/yami/shop/bean/vo/SkuStatisticsVo.java

@@ -0,0 +1,28 @@
+
+package com.yami.shop.bean.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SkuStatisticsVo {
+
+    @ApiModelProperty("skuId")
+    private Long skuId;
+
+    @ApiModelProperty("skuName")
+    private String skuName;
+
+    @ApiModelProperty("规格")
+    private String spec;
+
+    @ApiModelProperty("单价")
+    private Double price;
+
+    @ApiModelProperty("商品总数量")
+    private Integer prodCount;
+}

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/SkuController.java

@@ -10,20 +10,25 @@
 
 package com.yami.shop.platform.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yami.shop.bean.model.Sku;
+import com.yami.shop.bean.po.FreightStatisticsPo;
+import com.yami.shop.bean.po.SkuStatisticsPo;
+import com.yami.shop.bean.vo.FreightStatisticsVo;
+import com.yami.shop.bean.vo.SkuStatistics;
+import com.yami.shop.common.util.PageParam;
+import com.yami.shop.common.util.R;
 import com.yami.shop.service.SkuService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import com.yami.shop.common.util.R;
 /**
  * 商品SKU管理实现
  *
@@ -44,4 +49,30 @@ public class SkuController {
         List<Sku> skus = skuService.listByProdId(prodId);
         return R.SUCCESS(skus);
     }
+
+    @GetMapping("/skuStatisticsList")
+    @ApiOperation(value = "对账单汇总表（商品）-列表")
+    public R<IPage<SkuStatistics>> skuStatisticsList(PageParam<SkuStatisticsPo> page, SkuStatisticsPo po) {
+        IPage<SkuStatistics> commList = new Page<>();
+        return R.SUCCESS(commList);
+    }
+
+    @GetMapping("/skuStatisticsExcel")
+    @ApiOperation("对账单汇总表（商品）-导出")
+    public R<Void> skuStatisticsExcel(HttpServletResponse response, SkuStatisticsPo po) {
+        return R.SUCCESS();
+    }
+
+    @GetMapping("/freightStatisticsList")
+    @ApiOperation(value = "运费明细表-列表")
+    public R<IPage<FreightStatisticsVo>> skuStatisticsList(PageParam<FreightStatisticsPo> page, FreightStatisticsPo po) {
+        IPage<FreightStatisticsVo> commList = new Page<>();
+        return R.SUCCESS(commList);
+    }
+
+    @GetMapping("/freightStatisticsExcel")
+    @ApiOperation("运费明细表-导出")
+    public R<Void> freightStatisticsExcel(HttpServletResponse response, FreightStatisticsPo po) {
+        return R.SUCCESS();
+    }
 }

yami-shop-service/src/main/java/com/yami/shop/dao/ChannelMapper.java

@@ -13,8 +13,8 @@ package com.yami.shop.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.model.Channel;
-import com.yami.shop.bean.model.ChannelProd;
 import com.yami.shop.bean.vo.ChannelVO;
+import com.yami.shop.bean.vo.IdNameVo;
 import com.yami.shop.common.util.PageParam;
 import org.apache.ibatis.annotations.Param;
 
@@ -33,4 +33,6 @@ public interface ChannelMapper extends BaseMapper<Channel> {
     Channel selectByName(@Param("channelName") String channelName);
 
     IPage<ChannelVO> statisticsPage(@Param("pageParam")PageParam pageParam, @Param("channel")Channel channel);
+
+    List<IdNameVo> queryMyChannel(Long userId);
 }

yami-shop-service/src/main/java/com/yami/shop/service/ChannelService.java

@@ -3,10 +3,12 @@ package com.yami.shop.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yami.shop.bean.model.Channel;
-import com.yami.shop.bean.model.ChannelProd;
 import com.yami.shop.bean.vo.ChannelVO;
+import com.yami.shop.bean.vo.IdNameVo;
 import com.yami.shop.common.util.PageParam;
 
+import java.util.List;
+
 /**
  * 渠道管理服务接口
  * @author fbj 2024/01/01.
@@ -20,5 +22,7 @@ public interface ChannelService extends IService<Channel> {
      * @return 渠道统计分页数据
      */
     IPage<ChannelVO> statisticsPage(PageParam pageParam, Channel channel);
+
+    List<IdNameVo> queryMyChannel(Long userId);
 }
 

yami-shop-service/src/main/java/com/yami/shop/service/impl/ChannelServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yami.shop.bean.model.Channel;
 import com.yami.shop.bean.vo.ChannelVO;
+import com.yami.shop.bean.vo.IdNameVo;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.dao.ChannelMapper;
 import com.yami.shop.service.ChannelService;
@@ -11,6 +12,8 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 渠道管理服务实现类
  *
@@ -25,4 +28,9 @@ public class ChannelServiceImpl extends ServiceImpl<ChannelMapper, Channel> impl
     public IPage<ChannelVO> statisticsPage(PageParam pageParam, Channel channel) {
          return baseMapper.statisticsPage(pageParam, channel);
     }
+
+    @Override
+    public List<IdNameVo> queryMyChannel(Long userId) {
+        return baseMapper.queryMyChannel(userId);
+    }
 }

yami-shop-service/src/main/resources/mapper/ChannelMapper.xml

@@ -31,4 +31,11 @@
         group by c.id
 
     </select>
+
+    <select id="queryMyChannel" resultType="com.yami.shop.bean.vo.IdNameVo">
+        SELECT b.id,b.channel_name name FROM tz_sys_user_channel a
+        LEFT JOIN tz_channel b on a.channel_id=b.id
+        WHERE a.user_id=#{userId}
+    </select>
+
 </mapper>