From 22486c6f0c0815b9c583fa1ec3739fbfd7ccbbd9 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 23 Jul 2024 17:36:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SmsSalesBillDetailDiscountRest.java | 96 ++++++++++++ .../sales/apiadmin/SmsSalesBillShopRest.java | 96 ++++++++++++ .../sales/biz/smssalesbill/SmsSalesBill.java | 3 +- .../smssalesbill/SmsSalesBillDetailsVo.java | 15 ++ .../biz/smssalesbill/SmsSalesBillDto.java | 14 +- .../biz/smssalesbill/SmsSalesBillMapper.java | 2 + .../biz/smssalesbill/SmsSalesBillMapper.xml | 5 + .../biz/smssalesbill/SmsSalesBillService.java | 139 ++++++++++++------ .../SmsSalesBillAccount.java | 2 + .../SmsSalesBillAmount.java | 7 +- .../SmsSalesBillDetail.java | 23 +++ .../SmsSalesBillDetailDetailsVo.java | 20 +++ .../SmsSalesBillDetailDiscount.java | 68 +++++++++ .../SmsSalesBillDetailDiscountDetailsVo.java | 69 +++++++++ .../SmsSalesBillDetailDiscountDto.java | 69 +++++++++ .../SmsSalesBillDetailDiscountMapper.java | 64 ++++++++ .../SmsSalesBillDetailDiscountMapper.xml | 13 ++ .../SmsSalesBillDetailDiscountQuery.java | 67 +++++++++ .../SmsSalesBillDetailDiscountService.java | 105 +++++++++++++ .../SmsSalesBillDetailDiscountVo.java | 69 +++++++++ .../SmsSalesBillInvoice.java | 17 ++- .../SmsSalesBillLogistics.java | 29 +++- .../SmsSalesBillshipper.java | 6 + .../smssalesbillshop/SmsSalesBillShop.java | 70 +++++++++ .../SmsSalesBillShopDetailsVo.java | 71 +++++++++ .../smssalesbillshop/SmsSalesBillShopDto.java | 71 +++++++++ .../SmsSalesBillShopMapper.java | 64 ++++++++ .../SmsSalesBillShopMapper.xml | 13 ++ .../SmsSalesBillShopQuery.java | 69 +++++++++ .../SmsSalesBillShopService.java | 105 +++++++++++++ .../smssalesbillshop/SmsSalesBillShopVo.java | 71 +++++++++ 31 files changed, 1483 insertions(+), 49 deletions(-) create mode 100644 src/main/java/com/yxt/sales/apiadmin/SmsSalesBillDetailDiscountRest.java create mode 100644 src/main/java/com/yxt/sales/apiadmin/SmsSalesBillShopRest.java create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscount.java create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountDetailsVo.java create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountDto.java create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountMapper.java create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountMapper.xml create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountQuery.java create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountService.java create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountVo.java create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShop.java create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopDetailsVo.java create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopDto.java create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopMapper.java create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopMapper.xml create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopQuery.java create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopService.java create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopVo.java diff --git a/src/main/java/com/yxt/sales/apiadmin/SmsSalesBillDetailDiscountRest.java b/src/main/java/com/yxt/sales/apiadmin/SmsSalesBillDetailDiscountRest.java new file mode 100644 index 0000000..abe0bde --- /dev/null +++ b/src/main/java/com/yxt/sales/apiadmin/SmsSalesBillDetailDiscountRest.java @@ -0,0 +1,96 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.apiadmin; + +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.smssalesbilldetaildiscount.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillDetailDiscountFeignFallback.java
+ * Class: com.yxt.sales.apiadmin.SmsSalesBillDetailDiscountRest
+ * Description: 销售订单-优惠.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "销售订单-优惠") +@RestController("com.yxt.sales.apiadmin.SmsSalesBillDetailDiscountRest") +@RequestMapping("v1/smssalesbilldetaildiscount") +public class SmsSalesBillDetailDiscountRest { + + @Autowired + private SmsSalesBillDetailDiscountService smsSalesBillDetailDiscountService; + + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = smsSalesBillDetailDiscountService.listPageVo(pq); + return rb.success().setData(pv); + } + + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SmsSalesBillDetailDiscountDto dto){ + ResultBean rb = ResultBean.fireFail(); + smsSalesBillDetailDiscountService.saveOrUpdateDto(dto); + return rb.success(); + } + + + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + smsSalesBillDetailDiscountService.delBySids(sids); + return rb.success(); + } + + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + SmsSalesBillDetailDiscountDetailsVo vo = smsSalesBillDetailDiscountService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/sales/apiadmin/SmsSalesBillShopRest.java b/src/main/java/com/yxt/sales/apiadmin/SmsSalesBillShopRest.java new file mode 100644 index 0000000..ed70bf3 --- /dev/null +++ b/src/main/java/com/yxt/sales/apiadmin/SmsSalesBillShopRest.java @@ -0,0 +1,96 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.apiadmin; + +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.smssalesbillshop.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillShopFeignFallback.java
+ * Class: com.yxt.sales.apiadmin.SmsSalesBillShopRest
+ * Description: 销售订单-店铺信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "销售订单-店铺信息") +@RestController("com.yxt.sales.apiadmin.SmsSalesBillShopRest") +@RequestMapping("v1/smssalesbillshop") +public class SmsSalesBillShopRest { + + @Autowired + private SmsSalesBillShopService smsSalesBillShopService; + + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = smsSalesBillShopService.listPageVo(pq); + return rb.success().setData(pv); + } + + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SmsSalesBillShopDto dto){ + ResultBean rb = ResultBean.fireFail(); + smsSalesBillShopService.saveOrUpdateDto(dto); + return rb.success(); + } + + + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + smsSalesBillShopService.delBySids(sids); + return rb.success(); + } + + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + SmsSalesBillShopDetailsVo vo = smsSalesBillShopService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBill.java b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBill.java index 3fe2224..92ae38b 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBill.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBill.java @@ -86,5 +86,6 @@ public class SmsSalesBill extends BaseEntity { private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - + @ApiModelProperty("订单标记（已开票、仓库打回等）") + private Integer billState; // 订单标记（已开票、仓库打回等） } diff --git a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDetailsVo.java b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDetailsVo.java index c3968bf..b2335ef 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDetailsVo.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDetailsVo.java @@ -167,4 +167,19 @@ public class SmsSalesBillDetailsVo implements Vo { @ApiModelProperty("付款凭证") private List files = new ArrayList<>(); // 付款凭证 + //-------------补充------------- + @ApiModelProperty("快递公司sid") + private String logisticsNameSid; // 快递公司sid + @ApiModelProperty("收货人sid") + private String shipperSid; // 收货人sid + @ApiModelProperty("固定电话") + private String phone; // 固定电话 + @ApiModelProperty("店铺sid") + private String shopSid; // 店铺sid + @ApiModelProperty("店铺名称") + private String shopName; // 店铺名称 + @ApiModelProperty("订单号") + private String billNo; // 订单号 + + } diff --git a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDto.java b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDto.java index acf0186..67b649c 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDto.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDto.java @@ -169,6 +169,18 @@ public class SmsSalesBillDto implements Dto { private List files = new ArrayList<>(); // 付款凭证 - + //-------------补充------------- + @ApiModelProperty("快递公司sid") + private String logisticsNameSid; // 快递公司sid + @ApiModelProperty("收货人sid") + private String shipperSid; // 收货人sid + @ApiModelProperty("固定电话") + private String phone; // 固定电话 + @ApiModelProperty("店铺sid") + private String shopSid; // 店铺sid + @ApiModelProperty("店铺名称") + private String shopName; // 店铺名称 + @ApiModelProperty("订单号") + private String billNo; // 订单号 } diff --git a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillMapper.java b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillMapper.java index b94f034..647fa63 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillMapper.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillMapper.java @@ -60,4 +60,6 @@ public interface SmsSalesBillMapper extends BaseMapper { @Select("select * from sms_sales_bill") List selectListVo(); + + int selectNum(String bill); } diff --git a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillMapper.xml b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillMapper.xml index 6b1c49b..01c6221 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillMapper.xml +++ b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillMapper.xml @@ -30,4 +30,9 @@ + 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 cebe5b1..24be830 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java @@ -26,6 +26,7 @@ package com.yxt.sales.biz.smssalesbill; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.config.component.FileUploadComponent; @@ -94,7 +95,6 @@ public class SmsSalesBillService extends MybatisBaseService createQueryWrapper(SmsSalesBillQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -102,35 +102,35 @@ public class SmsSalesBillService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(createEndTime), "date_format (s.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" - ); + if (StringUtils.isNotBlank(query.getDeptName())) { + qw.like("s.deptName", query.getDeptName()); + } + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("s.billNo", query.getBillNo()); + } + if (StringUtils.isNotBlank(query.getSalesName())) { + qw.like("s.salesName", query.getSalesName()); + } + if (StringUtils.isNotBlank(query.getBillTypeKey())) { + qw.like("s.billTypeKey", query.getBillTypeKey()); + } + if (StringUtils.isNotBlank(query.getDeliveryTypeKey())) { + qw.eq("l.deliveryTypeKey", query.getDeliveryTypeKey()); + } + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.like("s.customerName", query.getCustomerName()); + } + if (StringUtils.isNotBlank(query.getWarehouseName())) { + qw.like("s.warehouseName", query.getWarehouseName()); + } + if (StringUtils.isNotBlank(query.getCreateOrgSid())) { + qw.eq("s.createOrgSid", query.getCreateOrgSid()); + } + String createStartTime = query.getStartDate(); + String createEndTime = query.getEndDate(); + qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (s.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createEndTime), "date_format (s.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); return qw; } @@ -143,6 +143,33 @@ public class SmsSalesBillService extends MybatisBaseService goodsList = dto.getGoodsList(); if (!goodsList.isEmpty()) { for (SmsSalesBillDetailDetailsVo g : goodsList) { SmsSalesBillDetail detail = new SmsSalesBillDetail(); - BeanUtil.copyProperties(g,detail,"id","sid"); + BeanUtil.copyProperties(g, detail, "id", "sid"); detail.setBillSid(sid); + if (!g.getPic().isEmpty()) { + StringBuffer sb = new StringBuffer(); + List pic = g.getPic(); + for (String s : pic) { + String filePath = s.replace(fileUploadComponent.getUrlPrefix(), ""); + sb.append(filePath).append(","); + } + if (sb.length() > 0) { + sb.delete(sb.length() - 1, sb.length()); + detail.setGoodsImgUrl(sb.toString()); + } + } + smsSalesBillDetailService.insert(detail); } } @@ -232,33 +274,42 @@ public class SmsSalesBillService extends MybatisBaseService goods = smsSalesBillDetailService.selByBillSid(sid); if (!goods.isEmpty()) { for (SmsSalesBillDetail detail : goods) { SmsSalesBillDetailDetailsVo detailVo = new SmsSalesBillDetailDetailsVo(); - BeanUtil.copyProperties(detail,detailVo,"id","sid"); + BeanUtil.copyProperties(detail, detailVo, "id", "sid"); + if (StringUtils.isNotBlank(detail.getGoodsImgUrl())) { + List picList = new ArrayList<>(); + String picUrl = detail.getGoodsImgUrl(); + String[] split = picUrl.split(","); + for (String s : split) { + picList.add(fileUploadComponent.getUrlPrefix() + s); + } + detailVo.setPic(picList); + } goodsList.add(detailVo); } vo.setGoodsList(goodsList); } SmsSalesBillInvoice invoice = smsSalesBillInvoiceService.selByBillSid(sid); if (null != invoice) { - BeanUtil.copyProperties(invoice,vo,"id","sid","createBySid","createTime"); + BeanUtil.copyProperties(invoice, vo, "id", "sid", "createBySid", "createTime"); } SmsSalesBillLogistics logistics = smsSalesBillLogisticsService.selByBillSid(sid); if (null != logistics) { - BeanUtil.copyProperties(logistics,vo,"id","sid","createBySid","createTime"); + BeanUtil.copyProperties(logistics, vo, "id", "sid", "createBySid", "createTime"); } SmsSalesBillshipper billshipper = smsSalesBillshipperService.selByBillSid(sid); if (null != billshipper) { - BeanUtil.copyProperties(billshipper,vo,"id","sid","createBySid","createTime"); + BeanUtil.copyProperties(billshipper, vo, "id", "sid", "createBySid", "createTime"); } List fileQueryUrls = new ArrayList<>(); List smsAppendixDetailsVos = smsAppendixService.selByLinkSid(sid); diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillaccount/SmsSalesBillAccount.java b/src/main/java/com/yxt/sales/biz/smssalesbillaccount/SmsSalesBillAccount.java index c3aa6b0..3c287f2 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbillaccount/SmsSalesBillAccount.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbillaccount/SmsSalesBillAccount.java @@ -56,6 +56,8 @@ public class SmsSalesBillAccount extends BaseEntity { private String billSid; // 单据sid @ApiModelProperty("结算账户") private String bankAccount; // 结算账户 + @ApiModelProperty("结算账户") + private String bankAccountKey; // 结算账户 @ApiModelProperty("结算金额") private BigDecimal amount; // 结算金额 diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillamount/SmsSalesBillAmount.java b/src/main/java/com/yxt/sales/biz/smssalesbillamount/SmsSalesBillAmount.java index d2a98c5..5b59eb3 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbillamount/SmsSalesBillAmount.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbillamount/SmsSalesBillAmount.java @@ -76,5 +76,10 @@ public class SmsSalesBillAmount extends BaseEntity { private BigDecimal totalDebt; // 总欠款 @ApiModelProperty("预收款余额") private BigDecimal advanceBalance; // 预收款余额 - + @ApiModelProperty("买家实付") + private BigDecimal realPay; // 买家实付 + @ApiModelProperty("服务费") + private BigDecimal serviceAmount; // 服务费 + @ApiModelProperty("声明价值（保值）") + private BigDecimal declaredValue; // 声明价值（保值） } diff --git a/src/main/java/com/yxt/sales/biz/smssalesbilldetail/SmsSalesBillDetail.java b/src/main/java/com/yxt/sales/biz/smssalesbilldetail/SmsSalesBillDetail.java index 82eb564..fd991fa 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbilldetail/SmsSalesBillDetail.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbilldetail/SmsSalesBillDetail.java @@ -26,12 +26,14 @@ package com.yxt.sales.biz.smssalesbilldetail; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; /** * Project: ss-sales(ss-sales)
@@ -92,5 +94,26 @@ public class SmsSalesBillDetail extends BaseEntity { private BigDecimal amount; // 惠后金额 @ApiModelProperty("库存数量") private BigDecimal inventoryCount; // 库存数量 + @ApiModelProperty("条码") + private String barCode; // 条码 + @ApiModelProperty("图片") + private String goodsImgUrl; // 图片 + @ApiModelProperty("参考进价") + private BigDecimal referenceCost; // 参考进价 + @ApiModelProperty("批次号") + private String batchNumber; // 批次号 + @ApiModelProperty("库存状况（0未分配/1已分配）") + private Integer inventoryState; // 库存状况（0未分配/1已分配） + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预计发货时间") + private Date expectSendDate; // 预计发货时间 + @ApiModelProperty("税率") + private BigDecimal taxRate; // 税率 + @ApiModelProperty("税额") + private BigDecimal taxAmount; // 税额 + @ApiModelProperty("未含税价") + private BigDecimal unTaxPrice; // 未含税价 + @ApiModelProperty("总税额（未含税总额）") + private BigDecimal taxTotalAmount; // 总税额（未含税总额） } diff --git a/src/main/java/com/yxt/sales/biz/smssalesbilldetail/SmsSalesBillDetailDetailsVo.java b/src/main/java/com/yxt/sales/biz/smssalesbilldetail/SmsSalesBillDetailDetailsVo.java index 13a782b..8c648ba 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbilldetail/SmsSalesBillDetailDetailsVo.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbilldetail/SmsSalesBillDetailDetailsVo.java @@ -33,6 +33,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; /** * Project: ss-sales(ss-sales)
@@ -93,4 +95,22 @@ public class SmsSalesBillDetailDetailsVo implements Vo { private String inventoryCount; // 库存数量 @ApiModelProperty("备注") private String remarks; // 备注 + + @ApiModelProperty("批次号") + private String batchNumber; // 批次号 + @ApiModelProperty("税率") + private String taxRate; // 库存数量 + @ApiModelProperty("税额") + private String taxAmount; // 税额 + @ApiModelProperty("未含税价") + private String unTaxPrice; // 未含税价 + @ApiModelProperty("总税额（未含税总额）") + private String taxTotalAmount; // 总税额（未含税总额） + @ApiModelProperty("图片") + private String goodsImgUrl; // 图片 + + /** + * 图片 + */ + private List pic = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscount.java b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscount.java new file mode 100644 index 0000000..b026632 --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscount.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.biz.smssalesbilldetaildiscount; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillDetailDiscount.java
+ * Class: com.yxt.sales.api.smssalesbilldetaildiscount.SmsSalesBillDetailDiscount
+ * Description: 销售订单-优惠.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-优惠", description = "销售订单-优惠") +@TableName("sms_sales_bill_detail_discount") +public class SmsSalesBillDetailDiscount extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("订单明细sid") + private String billDetailSid; // 订单明细sid + @ApiModelProperty("优惠名称") + private String discountName; // 优惠名称 + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; // 优惠金额 + @ApiModelProperty("平台商品名称") + private String platGoodsName; // 平台商品名称 + @ApiModelProperty("平台规格名称") + private String platOwnSpec; // 平台规格名称 + +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountDetailsVo.java b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountDetailsVo.java new file mode 100644 index 0000000..748e5f4 --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountDetailsVo.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.biz.smssalesbilldetaildiscount; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillDetailDiscountVo.java
+ * Class: com.yxt.sales.api.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountVo
+ * Description: 销售订单-优惠 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-优惠 视图数据详情", description = "销售订单-优惠 视图数据详情") +public class SmsSalesBillDetailDiscountDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("订单明细sid") + private String billDetailSid; // 订单明细sid + @ApiModelProperty("优惠名称") + private String discountName; // 优惠名称 + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; // 优惠金额 + @ApiModelProperty("平台商品名称") + private String platGoodsName; // 平台商品名称 + @ApiModelProperty("平台规格名称") + private String platOwnSpec; // 平台规格名称 + +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountDto.java b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountDto.java new file mode 100644 index 0000000..cb5f18b --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountDto.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.biz.smssalesbilldetaildiscount; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillDetailDiscountDto.java
+ * Class: com.yxt.sales.api.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountDto
+ * Description: 销售订单-优惠 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-优惠 数据传输对象", description = "销售订单-优惠 数据传输对象") +public class SmsSalesBillDetailDiscountDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("订单明细sid") + private String billDetailSid; // 订单明细sid + @ApiModelProperty("优惠名称") + private String discountName; // 优惠名称 + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; // 优惠金额 + @ApiModelProperty("平台商品名称") + private String platGoodsName; // 平台商品名称 + @ApiModelProperty("平台规格名称") + private String platOwnSpec; // 平台规格名称 + +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountMapper.java b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountMapper.java new file mode 100644 index 0000000..0724008 --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountMapper.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.biz.smssalesbilldetaildiscount; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + + +import java.util.List; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillDetailDiscountMapper.java
+ * Class: com.yxt.sales.biz.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountMapper
+ * Description: 销售订单-优惠.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SmsSalesBillDetailDiscountMapper extends BaseMapper { + + //@Update("update sms_sales_bill_detail_discount set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from sms_sales_bill_detail_discount") + List selectListVo(); +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountMapper.xml b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountMapper.xml new file mode 100644 index 0000000..e401200 --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountQuery.java b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountQuery.java new file mode 100644 index 0000000..8f34452 --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountQuery.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.biz.smssalesbilldetaildiscount; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillDetailDiscountQuery.java
+ * Class: com.yxt.sales.api.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountQuery
+ * Description: 销售订单-优惠 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-优惠 查询条件", description = "销售订单-优惠 查询条件") +public class SmsSalesBillDetailDiscountQuery implements Query { + + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("订单明细sid") + private String billDetailSid; // 订单明细sid + @ApiModelProperty("优惠名称") + private String discountName; // 优惠名称 + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; // 优惠金额 + @ApiModelProperty("平台商品名称") + private String platGoodsName; // 平台商品名称 + @ApiModelProperty("平台规格名称") + private String platOwnSpec; // 平台规格名称 + +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountService.java b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountService.java new file mode 100644 index 0000000..99aa6ff --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountService.java @@ -0,0 +1,105 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.biz.smssalesbilldetaildiscount; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; + + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillDetailDiscountService.java
+ * Class: com.yxt.sales.biz.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountService
+ * Description: 销售订单-优惠 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SmsSalesBillDetailDiscountService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(SmsSalesBillDetailDiscountQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SmsSalesBillDetailDiscountQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(SmsSalesBillDetailDiscountDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(SmsSalesBillDetailDiscountDto dto){ + SmsSalesBillDetailDiscount entity = new SmsSalesBillDetailDiscount(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(SmsSalesBillDetailDiscountDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + SmsSalesBillDetailDiscount entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public SmsSalesBillDetailDiscountDetailsVo fetchDetailsVoBySid(String sid){ + SmsSalesBillDetailDiscount entity = fetchBySid(sid); + SmsSalesBillDetailDiscountDetailsVo vo = new SmsSalesBillDetailDiscountDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountVo.java b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountVo.java new file mode 100644 index 0000000..0cc7f82 --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbilldetaildiscount/SmsSalesBillDetailDiscountVo.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.biz.smssalesbilldetaildiscount; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillDetailDiscountVo.java
+ * Class: com.yxt.sales.api.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountVo
+ * Description: 销售订单-优惠 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-优惠 视图数据对象", description = "销售订单-优惠 视图数据对象") +public class SmsSalesBillDetailDiscountVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("订单明细sid") + private String billDetailSid; // 订单明细sid + @ApiModelProperty("优惠名称") + private String discountName; // 优惠名称 + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; // 优惠金额 + @ApiModelProperty("平台商品名称") + private String platGoodsName; // 平台商品名称 + @ApiModelProperty("平台规格名称") + private String platOwnSpec; // 平台规格名称 + +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillinvoice/SmsSalesBillInvoice.java b/src/main/java/com/yxt/sales/biz/smssalesbillinvoice/SmsSalesBillInvoice.java index 5ccf516..2567a4f 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbillinvoice/SmsSalesBillInvoice.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbillinvoice/SmsSalesBillInvoice.java @@ -68,5 +68,20 @@ public class SmsSalesBillInvoice extends BaseEntity { private String invoiceCode; // 发票代码 @ApiModelProperty("税率") private BigDecimal taxRate; // 税率 - + @ApiModelProperty("开票形式（001纸质发票/002电子发票") + private String invoiceMediumKey; // 开票形式（001纸质发票/002电子发票 + @ApiModelProperty("开票形式（纸质发票/电子发票）") + private String invoiceMediumValue; // 开票形式（纸质发票/电子发票） + @ApiModelProperty("内容") + private String invoiceContent; // 内容 + @ApiModelProperty("开户银行") + private String bankName; // 开户银行 + @ApiModelProperty("银行账户") + private String bankAccount; // 银行账户 + @ApiModelProperty("详细地址") + private String address; // 详细地址 + @ApiModelProperty("固定电话") + private String phone; // 固定电话 + @ApiModelProperty("邮箱") + private String e_mail; // 邮箱 } diff --git a/src/main/java/com/yxt/sales/biz/smssalesbilllogistics/SmsSalesBillLogistics.java b/src/main/java/com/yxt/sales/biz/smssalesbilllogistics/SmsSalesBillLogistics.java index abdf12b..0ba1cfa 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbilllogistics/SmsSalesBillLogistics.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbilllogistics/SmsSalesBillLogistics.java @@ -28,6 +28,8 @@ package com.yxt.sales.biz.smssalesbilllogistics; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; + +import java.math.BigDecimal; import java.util.Date; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -54,6 +56,8 @@ public class SmsSalesBillLogistics extends BaseEntity { @ApiModelProperty("销售单sid") private String billSid; // 销售单sid + @ApiModelProperty("物流公司sid") + private String logisticsNameSid; // 物流公司 @ApiModelProperty("物流公司") private String logisticsName; // 物流公司 @ApiModelProperty("物流单号") @@ -71,5 +75,28 @@ public class SmsSalesBillLogistics extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("预计送达时间") private Date deliveryDate; // 预计送达时间 - + @ApiModelProperty("快递成本/干线费用") + private BigDecimal logisticsCost; // 快递成本/干线费用 + @ApiModelProperty("重量(Kg)") + private BigDecimal weight; // 重量(Kg) + @ApiModelProperty("体积(m³)") + private BigDecimal volume; // 体积(m³) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("下单时间（距今）") + private Date billCreateTime; // 下单时间（距今） + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("付款时间（距今）") + private Date payTime; // 付款时间（距今） + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("承诺/最晚揽收时间") + private Date latestReceivingTime; // 承诺/最晚揽收时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("承诺/最晚发货时间") + private Date latestSendTime; // 承诺/最晚发货时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("承诺/最晚送达时间") + private Date latestArriveTime; // 承诺/最晚送达时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("应推时间") + private Date needPushTime; // 应推时间 } diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillshipper/SmsSalesBillshipper.java b/src/main/java/com/yxt/sales/biz/smssalesbillshipper/SmsSalesBillshipper.java index 3ab9ad1..748fb77 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbillshipper/SmsSalesBillshipper.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbillshipper/SmsSalesBillshipper.java @@ -76,5 +76,11 @@ public class SmsSalesBillshipper extends BaseEntity { private String shopName; // 店铺名称 @ApiModelProperty("买家留言") private String buyerMessage; // 买家留言 + @ApiModelProperty("真实姓名") + private String name; // 真实姓名 + @ApiModelProperty("身份证号码") + private String idNo; // 身份证号码 + @ApiModelProperty("固定电话") + private String phone; // 固定电话 } diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShop.java b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShop.java new file mode 100644 index 0000000..d9ac5a8 --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShop.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.biz.smssalesbillshop; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillShop.java
+ * Class: com.yxt.sales.api.smssalesbillshop.SmsSalesBillShop
+ * Description: 销售订单-店铺信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-店铺信息", description = "销售订单-店铺信息") +@TableName("sms_sales_bill_shop") +public class SmsSalesBillShop extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("店铺sid") + private String shopSid; // 店铺sid + @ApiModelProperty("店铺名称") + private String shopName; // 店铺名称 + @ApiModelProperty("代发店铺") + private String agentShop; // 代发店铺 + @ApiModelProperty("达人ID(买家ID)") + private String buyserID; // 达人ID(买家ID) + @ApiModelProperty("达人昵称") + private String buyserNickname; // 达人昵称 + @ApiModelProperty("原始平台") + private String originalPlat; // 原始平台 + @ApiModelProperty("原始单号") + private String originalBillNo; // 原始单号 + +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopDetailsVo.java b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopDetailsVo.java new file mode 100644 index 0000000..2627f39 --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopDetailsVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.biz.smssalesbillshop; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillShopVo.java
+ * Class: com.yxt.sales.api.smssalesbillshop.SmsSalesBillShopVo
+ * Description: 销售订单-店铺信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-店铺信息 视图数据详情", description = "销售订单-店铺信息 视图数据详情") +public class SmsSalesBillShopDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("店铺sid") + private String shopSid; // 店铺sid + @ApiModelProperty("店铺名称") + private String shopName; // 店铺名称 + @ApiModelProperty("代发店铺") + private String agentShop; // 代发店铺 + @ApiModelProperty("达人ID(买家ID)") + private String buyserID; // 达人ID(买家ID) + @ApiModelProperty("达人昵称") + private String buyserNickname; // 达人昵称 + @ApiModelProperty("原始平台") + private String originalPlat; // 原始平台 + @ApiModelProperty("原始单号") + private String originalBillNo; // 原始单号 + +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopDto.java b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopDto.java new file mode 100644 index 0000000..3f1482e --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopDto.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.biz.smssalesbillshop; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillShopDto.java
+ * Class: com.yxt.sales.api.smssalesbillshop.SmsSalesBillShopDto
+ * Description: 销售订单-店铺信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-店铺信息 数据传输对象", description = "销售订单-店铺信息 数据传输对象") +public class SmsSalesBillShopDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("店铺sid") + private String shopSid; // 店铺sid + @ApiModelProperty("店铺名称") + private String shopName; // 店铺名称 + @ApiModelProperty("代发店铺") + private String agentShop; // 代发店铺 + @ApiModelProperty("达人ID(买家ID)") + private String buyserID; // 达人ID(买家ID) + @ApiModelProperty("达人昵称") + private String buyserNickname; // 达人昵称 + @ApiModelProperty("原始平台") + private String originalPlat; // 原始平台 + @ApiModelProperty("原始单号") + private String originalBillNo; // 原始单号 + +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopMapper.java b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopMapper.java new file mode 100644 index 0000000..c9e6901 --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopMapper.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.biz.smssalesbillshop; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + + +import java.util.List; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillShopMapper.java
+ * Class: com.yxt.sales.biz.smssalesbillshop.SmsSalesBillShopMapper
+ * Description: 销售订单-店铺信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SmsSalesBillShopMapper extends BaseMapper { + + //@Update("update sms_sales_bill_shop set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from sms_sales_bill_shop") + List selectListVo(); +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopMapper.xml b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopMapper.xml new file mode 100644 index 0000000..584eaa4 --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopQuery.java b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopQuery.java new file mode 100644 index 0000000..6bc846e --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopQuery.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.biz.smssalesbillshop; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillShopQuery.java
+ * Class: com.yxt.sales.api.smssalesbillshop.SmsSalesBillShopQuery
+ * Description: 销售订单-店铺信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-店铺信息 查询条件", description = "销售订单-店铺信息 查询条件") +public class SmsSalesBillShopQuery implements Query { + + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("店铺sid") + private String shopSid; // 店铺sid + @ApiModelProperty("店铺名称") + private String shopName; // 店铺名称 + @ApiModelProperty("代发店铺") + private String agentShop; // 代发店铺 + @ApiModelProperty("达人ID(买家ID)") + private String buyserID; // 达人ID(买家ID) + @ApiModelProperty("达人昵称") + private String buyserNickname; // 达人昵称 + @ApiModelProperty("原始平台") + private String originalPlat; // 原始平台 + @ApiModelProperty("原始单号") + private String originalBillNo; // 原始单号 + +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopService.java b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopService.java new file mode 100644 index 0000000..0fa7549 --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopService.java @@ -0,0 +1,105 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.biz.smssalesbillshop; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; + + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillShopService.java
+ * Class: com.yxt.sales.biz.smssalesbillshop.SmsSalesBillShopService
+ * Description: 销售订单-店铺信息 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SmsSalesBillShopService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(SmsSalesBillShopQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SmsSalesBillShopQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(SmsSalesBillShopDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(SmsSalesBillShopDto dto){ + SmsSalesBillShop entity = new SmsSalesBillShop(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(SmsSalesBillShopDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + SmsSalesBillShop entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public SmsSalesBillShopDetailsVo fetchDetailsVoBySid(String sid){ + SmsSalesBillShop entity = fetchBySid(sid); + SmsSalesBillShopDetailsVo vo = new SmsSalesBillShopDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopVo.java b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopVo.java new file mode 100644 index 0000000..1a4528d --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbillshop/SmsSalesBillShopVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sales.biz.smssalesbillshop; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillShopVo.java
+ * Class: com.yxt.sales.api.smssalesbillshop.SmsSalesBillShopVo
+ * Description: 销售订单-店铺信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-店铺信息 视图数据对象", description = "销售订单-店铺信息 视图数据对象") +public class SmsSalesBillShopVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("店铺sid") + private String shopSid; // 店铺sid + @ApiModelProperty("店铺名称") + private String shopName; // 店铺名称 + @ApiModelProperty("代发店铺") + private String agentShop; // 代发店铺 + @ApiModelProperty("达人ID(买家ID)") + private String buyserID; // 达人ID(买家ID) + @ApiModelProperty("达人昵称") + private String buyserNickname; // 达人昵称 + @ApiModelProperty("原始平台") + private String originalPlat; // 原始平台 + @ApiModelProperty("原始单号") + private String originalBillNo; // 原始单号 + +}