diff --git a/src/main/java/com/yxt/sales/apiadmin/SmsSalesBillRest.java b/src/main/java/com/yxt/sales/apiadmin/SmsSalesBillRest.java index 70d22de..01d53d5 100644 --- a/src/main/java/com/yxt/sales/apiadmin/SmsSalesBillRest.java +++ b/src/main/java/com/yxt/sales/apiadmin/SmsSalesBillRest.java @@ -25,16 +25,33 @@ *********************************************************/ package com.yxt.sales.apiadmin; +import cn.hutool.core.bean.BeanUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.sales.biz.smssalesbill.*; +import com.yxt.sales.biz.smssalesbillaccount.SmsSalesBillAccountService; +import com.yxt.sales.biz.smssalesbillamount.SmsSalesBillAmount; +import com.yxt.sales.biz.smssalesbillamount.SmsSalesBillAmountService; +import com.yxt.sales.biz.smssalesbilldetail.SmsSalesBillDetail; +import com.yxt.sales.biz.smssalesbilldetail.SmsSalesBillDetailService; +import com.yxt.sales.biz.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountService; +import com.yxt.sales.biz.smssalesbillinvoice.SmsSalesBillInvoice; +import com.yxt.sales.biz.smssalesbillinvoice.SmsSalesBillInvoiceService; +import com.yxt.sales.biz.smssalesbilllogistics.SmsSalesBillLogistics; +import com.yxt.sales.biz.smssalesbilllogistics.SmsSalesBillLogisticsService; +import com.yxt.sales.biz.smssalesbillshipper.SmsSalesBillshipper; +import com.yxt.sales.biz.smssalesbillshipper.SmsSalesBillshipperService; +import com.yxt.sales.biz.smssalesbillshop.SmsSalesBillShop; +import com.yxt.sales.biz.smssalesbillshop.SmsSalesBillShopService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * Project: ss-sales(ss-sales)
@@ -56,7 +73,22 @@ public class SmsSalesBillRest { @Autowired private SmsSalesBillService smsSalesBillService; - + @Autowired + private SmsSalesBillshipperService smsSalesBillshipperService; + @Autowired + private SmsSalesBillShopService smsSalesBillShopService; + @Autowired + private SmsSalesBillLogisticsService smsSalesBillLogisticsService; + @Autowired + private SmsSalesBillInvoiceService smsSalesBillInvoiceService; + @Autowired + private SmsSalesBillDetailDiscountService smsSalesBillDetailDiscountService; + @Autowired + private SmsSalesBillDetailService smsSalesBillDetailService; + @Autowired + private SmsSalesBillAmountService smsSalesBillAmountService; + @Autowired + private SmsSalesBillAccountService smsSalesBillAccountService; @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @@ -67,6 +99,39 @@ public class SmsSalesBillRest { } + @ApiOperation("获取收货人信息") + @GetMapping("/getShipperByBillSid") + public SmsSalesBillshipper getShipperByBillSid(@RequestParam("sid") String sid){ + return smsSalesBillshipperService.selByBillSid(sid); + } + + @ApiOperation("获取店铺信息") + @GetMapping("/getShopByBillSid") + public SmsSalesBillShop getShopByBillSid(@RequestParam("sid") String sid){ + return smsSalesBillShopService.selByBillSid(sid); + } + + @ApiOperation("获取发票信息") + @GetMapping("/getInvoiceByBillSid") + public SmsSalesBillInvoice getInvoiceByBillSid(@RequestParam("sid") String sid){ + return smsSalesBillInvoiceService.selByBillSid(sid); + } + + @ApiOperation("获取物流信息") + @GetMapping("/getLogisticsByBillSid") + public SmsSalesBillLogistics getLogisticsByBillSid(@RequestParam("sid") String sid){ + return smsSalesBillLogisticsService.selByBillSid(sid); + } + @ApiOperation("获取商品信息") + @GetMapping("/getGoodsDetailByBillSid") + public List getGoodsDetailByBillSid(@RequestParam("sid") String sid){ + return smsSalesBillDetailService.selByBillSid(sid); + } + @ApiOperation("获取费用信息") + @GetMapping("/getAmountByBillSid") + public SmsSalesBillAmount getAmountByBillSid(@RequestParam("sid") String sid){ + return smsSalesBillAmountService.selByBillSid(sid); + } @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody SmsSalesBillDto dto){ diff --git a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java index 7e551c8..95ab0b1 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java @@ -487,6 +487,7 @@ public class SmsSalesBillService extends MybatisBaseService discounts = baseMapper.selReviewDiscountByBillSid(sid); if (!discounts.isEmpty()) { vo.setDiscounts(discounts); diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopMapper.java b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopMapper.java index c9e6901..19fd755 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopMapper.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopMapper.java @@ -61,4 +61,7 @@ public interface SmsSalesBillShopMapper extends BaseMapper { @Select("select * from sms_sales_bill_shop") List selectListVo(); + + @Select("select * from sms_sales_bill_shop where billSid =#{sid}") + SmsSalesBillShop selByBillSid(String sid); } diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopService.java b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopService.java index 0fa7549..fad3400 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopService.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopService.java @@ -102,4 +102,8 @@ public class SmsSalesBillShopService extends MybatisBaseService