修改销售订单
This commit is contained in:
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillDetailDiscountFeignFallback.java <br/>
|
||||||
|
* Class: com.yxt.sales.apiadmin.SmsSalesBillDetailDiscountRest <br/>
|
||||||
|
* Description: 销售订单-优惠. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @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<PagerVo<SmsSalesBillDetailDiscountVo>> listPage(@RequestBody PagerQuery<SmsSalesBillDetailDiscountQuery> pq){
|
||||||
|
ResultBean rb = ResultBean.fireFail();
|
||||||
|
PagerVo<SmsSalesBillDetailDiscountVo> 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<SmsSalesBillDetailDiscountDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
|
||||||
|
ResultBean rb = ResultBean.fireFail();
|
||||||
|
SmsSalesBillDetailDiscountDetailsVo vo = smsSalesBillDetailDiscountService.fetchDetailsVoBySid(sid);
|
||||||
|
return rb.success().setData(vo);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillShopFeignFallback.java <br/>
|
||||||
|
* Class: com.yxt.sales.apiadmin.SmsSalesBillShopRest <br/>
|
||||||
|
* Description: 销售订单-店铺信息. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @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<PagerVo<SmsSalesBillShopVo>> listPage(@RequestBody PagerQuery<SmsSalesBillShopQuery> pq){
|
||||||
|
ResultBean rb = ResultBean.fireFail();
|
||||||
|
PagerVo<SmsSalesBillShopVo> 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<SmsSalesBillShopDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
|
||||||
|
ResultBean rb = ResultBean.fireFail();
|
||||||
|
SmsSalesBillShopDetailsVo vo = smsSalesBillShopService.fetchDetailsVoBySid(sid);
|
||||||
|
return rb.success().setData(vo);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -86,5 +86,6 @@ public class SmsSalesBill extends BaseEntity {
|
|||||||
private String useOrgSid; // 使用组织sid
|
private String useOrgSid; // 使用组织sid
|
||||||
@ApiModelProperty("创建组织sid")
|
@ApiModelProperty("创建组织sid")
|
||||||
private String createOrgSid; // 创建组织sid
|
private String createOrgSid; // 创建组织sid
|
||||||
|
@ApiModelProperty("订单标记(已开票、仓库打回等)")
|
||||||
|
private Integer billState; // 订单标记(已开票、仓库打回等)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -167,4 +167,19 @@ public class SmsSalesBillDetailsVo implements Vo {
|
|||||||
@ApiModelProperty("付款凭证")
|
@ApiModelProperty("付款凭证")
|
||||||
private List<FileQueryUrl> files = new ArrayList<>(); // 付款凭证
|
private List<FileQueryUrl> 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; // 订单号
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -169,6 +169,18 @@ public class SmsSalesBillDto implements Dto {
|
|||||||
private List<FileQueryUrl> files = new ArrayList<>(); // 付款凭证
|
private List<FileQueryUrl> 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; // 订单号
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,4 +60,6 @@ public interface SmsSalesBillMapper extends BaseMapper<SmsSalesBill> {
|
|||||||
|
|
||||||
@Select("select * from sms_sales_bill")
|
@Select("select * from sms_sales_bill")
|
||||||
List<SmsSalesBillVo> selectListVo();
|
List<SmsSalesBillVo> selectListVo();
|
||||||
|
|
||||||
|
int selectNum(String bill);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,4 +30,9 @@
|
|||||||
<select id="selectListAllVo" resultType="com.yxt.sales.biz.smssalesbill.SmsSalesBillVo">
|
<select id="selectListAllVo" resultType="com.yxt.sales.biz.smssalesbill.SmsSalesBillVo">
|
||||||
SELECT * FROM sms_sales_bill <where> ${ew.sqlSegment} </where>
|
SELECT * FROM sms_sales_bill <where> ${ew.sqlSegment} </where>
|
||||||
</select>
|
</select>
|
||||||
|
<select id="selectNum" resultType="java.lang.Integer">
|
||||||
|
select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
|
||||||
|
from sms_sales_bill
|
||||||
|
where billNo LIKE concat(#{bill}, '%')
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
package com.yxt.sales.biz.smssalesbill;
|
package com.yxt.sales.biz.smssalesbill;
|
||||||
|
|
||||||
import cn.hutool.core.bean.BeanUtil;
|
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.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.yxt.common.base.config.component.FileUploadComponent;
|
import com.yxt.common.base.config.component.FileUploadComponent;
|
||||||
@@ -94,7 +95,6 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
|
|||||||
private FileUploadComponent fileUploadComponent;
|
private FileUploadComponent fileUploadComponent;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private QueryWrapper<SmsSalesBill> createQueryWrapper(SmsSalesBillQuery query) {
|
private QueryWrapper<SmsSalesBill> createQueryWrapper(SmsSalesBillQuery query) {
|
||||||
// todo: 这里根据具体业务调整查询条件
|
// todo: 这里根据具体业务调整查询条件
|
||||||
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
||||||
@@ -102,35 +102,35 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
|
|||||||
if (StringUtils.isNotBlank(query.getCreateByName())) {
|
if (StringUtils.isNotBlank(query.getCreateByName())) {
|
||||||
qw.like("s.createByName", query.getCreateByName());
|
qw.like("s.createByName", query.getCreateByName());
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotBlank(query.getDeptName())) {
|
if (StringUtils.isNotBlank(query.getDeptName())) {
|
||||||
qw.like("s.deptName", query.getDeptName());
|
qw.like("s.deptName", query.getDeptName());
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotBlank(query.getBillNo())) {
|
if (StringUtils.isNotBlank(query.getBillNo())) {
|
||||||
qw.like("s.billNo", query.getBillNo());
|
qw.like("s.billNo", query.getBillNo());
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotBlank(query.getSalesName())) {
|
if (StringUtils.isNotBlank(query.getSalesName())) {
|
||||||
qw.like("s.salesName", query.getSalesName());
|
qw.like("s.salesName", query.getSalesName());
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotBlank(query.getBillTypeKey())) {
|
if (StringUtils.isNotBlank(query.getBillTypeKey())) {
|
||||||
qw.like("s.billTypeKey", query.getBillTypeKey());
|
qw.like("s.billTypeKey", query.getBillTypeKey());
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotBlank(query.getDeliveryTypeKey())) {
|
if (StringUtils.isNotBlank(query.getDeliveryTypeKey())) {
|
||||||
qw.eq("l.deliveryTypeKey", query.getDeliveryTypeKey());
|
qw.eq("l.deliveryTypeKey", query.getDeliveryTypeKey());
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotBlank(query.getCustomerName())) {
|
if (StringUtils.isNotBlank(query.getCustomerName())) {
|
||||||
qw.like("s.customerName", query.getCustomerName());
|
qw.like("s.customerName", query.getCustomerName());
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotBlank(query.getWarehouseName())) {
|
if (StringUtils.isNotBlank(query.getWarehouseName())) {
|
||||||
qw.like("s.warehouseName", query.getWarehouseName());
|
qw.like("s.warehouseName", query.getWarehouseName());
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotBlank(query.getCreateOrgSid())) {
|
if (StringUtils.isNotBlank(query.getCreateOrgSid())) {
|
||||||
qw.eq("s.createOrgSid", query.getCreateOrgSid());
|
qw.eq("s.createOrgSid", query.getCreateOrgSid());
|
||||||
}
|
}
|
||||||
String createStartTime = query.getStartDate();
|
String createStartTime = query.getStartDate();
|
||||||
String createEndTime = query.getEndDate();
|
String createEndTime = query.getEndDate();
|
||||||
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (s.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
|
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')"
|
apply(StringUtils.isNotEmpty(createEndTime), "date_format (s.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
|
||||||
);
|
);
|
||||||
return qw;
|
return qw;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,6 +143,33 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
|
|||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 生成单据编号
|
||||||
|
*
|
||||||
|
* @param
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public String getApplyCode() {
|
||||||
|
String date = DateUtil.format(DateUtil.date(), "yyyyMM");
|
||||||
|
String bill = "XSD" + date;
|
||||||
|
int i = baseMapper.selectNum(bill);
|
||||||
|
String billNo = getBillNo(bill, i);
|
||||||
|
return billNo;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 生成单据编号规则
|
||||||
|
*
|
||||||
|
* @param bill 单据名称大写首字母+分公司编码+年份+月份
|
||||||
|
* @param i 根据单据编号包含单据名称大写首字母+分公司编码+年份+月份查询出来的单据的个数
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public String getBillNo(String bill, int i) {
|
||||||
|
String num = String.format("%04d", i + 1); // 不足4位补0
|
||||||
|
String billNo = bill + num;
|
||||||
|
return billNo;
|
||||||
|
}
|
||||||
|
|
||||||
public String saveOrUpdateDto(SmsSalesBillDto dto) {
|
public String saveOrUpdateDto(SmsSalesBillDto dto) {
|
||||||
String sid = "";
|
String sid = "";
|
||||||
if (StringUtils.isNotBlank(dto.getSid())) {
|
if (StringUtils.isNotBlank(dto.getSid())) {
|
||||||
@@ -155,41 +182,56 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
|
|||||||
smsSalesBillDetailService.delByBillSid(sid);
|
smsSalesBillDetailService.delByBillSid(sid);
|
||||||
smsAppendixService.delByLinkSid(sid);
|
smsAppendixService.delByLinkSid(sid);
|
||||||
SmsSalesBill smsSalesBill = fetchBySid(sid);
|
SmsSalesBill smsSalesBill = fetchBySid(sid);
|
||||||
BeanUtil.copyProperties(dto,smsSalesBill,"id","sid");
|
BeanUtil.copyProperties(dto, smsSalesBill, "id", "sid");
|
||||||
baseMapper.updateById(smsSalesBill);
|
baseMapper.updateById(smsSalesBill);
|
||||||
} else {
|
} else {
|
||||||
SmsSalesBill smsSalesBill = new SmsSalesBill();
|
SmsSalesBill smsSalesBill = new SmsSalesBill();
|
||||||
sid = smsSalesBill.getSid();
|
sid = smsSalesBill.getSid();
|
||||||
BeanUtil.copyProperties(dto,smsSalesBill,"id","sid");
|
BeanUtil.copyProperties(dto, smsSalesBill, "id", "sid");
|
||||||
|
String applyCode = getApplyCode();
|
||||||
|
smsSalesBill.setBillNo(applyCode);
|
||||||
baseMapper.insert(smsSalesBill);
|
baseMapper.insert(smsSalesBill);
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotBlank(sid)) {
|
if (StringUtils.isNotBlank(sid)) {
|
||||||
SmsSalesBillLogistics logistics = new SmsSalesBillLogistics();
|
SmsSalesBillLogistics logistics = new SmsSalesBillLogistics();
|
||||||
BeanUtil.copyProperties(dto,logistics,"id","sid");
|
BeanUtil.copyProperties(dto, logistics, "id", "sid");
|
||||||
logistics.setBillSid(sid);
|
logistics.setBillSid(sid);
|
||||||
smsSalesBillLogisticsService.insert(logistics);
|
smsSalesBillLogisticsService.insert(logistics);
|
||||||
SmsSalesBillshipper billshipper = new SmsSalesBillshipper();
|
SmsSalesBillshipper billshipper = new SmsSalesBillshipper();
|
||||||
BeanUtil.copyProperties(dto,billshipper,"id","sid");
|
BeanUtil.copyProperties(dto, billshipper, "id", "sid");
|
||||||
billshipper.setBillSid(sid);
|
billshipper.setBillSid(sid);
|
||||||
smsSalesBillshipperService.insert(billshipper);
|
smsSalesBillshipperService.insert(billshipper);
|
||||||
SmsSalesBillInvoice invoice = new SmsSalesBillInvoice();
|
SmsSalesBillInvoice invoice = new SmsSalesBillInvoice();
|
||||||
BeanUtil.copyProperties(dto,invoice,"id","sid");
|
BeanUtil.copyProperties(dto, invoice, "id", "sid");
|
||||||
invoice.setBillSid(sid);
|
invoice.setBillSid(sid);
|
||||||
smsSalesBillInvoiceService.insert(invoice);
|
smsSalesBillInvoiceService.insert(invoice);
|
||||||
SmsSalesBillAccount account = new SmsSalesBillAccount();
|
SmsSalesBillAccount account = new SmsSalesBillAccount();
|
||||||
BeanUtil.copyProperties(dto,account,"id","sid");
|
BeanUtil.copyProperties(dto, account, "id", "sid");
|
||||||
account.setBillSid(sid);
|
account.setBillSid(sid);
|
||||||
smsSalesBillAccountService.insert(account);
|
smsSalesBillAccountService.insert(account);
|
||||||
SmsSalesBillAmount amount = new SmsSalesBillAmount();
|
SmsSalesBillAmount amount = new SmsSalesBillAmount();
|
||||||
BeanUtil.copyProperties(dto,amount,"id","sid");
|
BeanUtil.copyProperties(dto, amount, "id", "sid");
|
||||||
amount.setBillSid(sid);
|
amount.setBillSid(sid);
|
||||||
smsSalesBillAmountService.insert(amount);
|
smsSalesBillAmountService.insert(amount);
|
||||||
List<SmsSalesBillDetailDetailsVo> goodsList = dto.getGoodsList();
|
List<SmsSalesBillDetailDetailsVo> goodsList = dto.getGoodsList();
|
||||||
if (!goodsList.isEmpty()) {
|
if (!goodsList.isEmpty()) {
|
||||||
for (SmsSalesBillDetailDetailsVo g : goodsList) {
|
for (SmsSalesBillDetailDetailsVo g : goodsList) {
|
||||||
SmsSalesBillDetail detail = new SmsSalesBillDetail();
|
SmsSalesBillDetail detail = new SmsSalesBillDetail();
|
||||||
BeanUtil.copyProperties(g,detail,"id","sid");
|
BeanUtil.copyProperties(g, detail, "id", "sid");
|
||||||
detail.setBillSid(sid);
|
detail.setBillSid(sid);
|
||||||
|
if (!g.getPic().isEmpty()) {
|
||||||
|
StringBuffer sb = new StringBuffer();
|
||||||
|
List<String> 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);
|
smsSalesBillDetailService.insert(detail);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -232,33 +274,42 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
|
|||||||
BeanUtil.copyProperties(entity, vo);
|
BeanUtil.copyProperties(entity, vo);
|
||||||
SmsSalesBillAccount account = smsSalesBillAccountService.selByBillSid(sid);
|
SmsSalesBillAccount account = smsSalesBillAccountService.selByBillSid(sid);
|
||||||
if (null != account) {
|
if (null != account) {
|
||||||
BeanUtil.copyProperties(account,vo,"id","sid","createBySid","createTime");
|
BeanUtil.copyProperties(account, vo, "id", "sid", "createBySid", "createTime");
|
||||||
}
|
}
|
||||||
SmsSalesBillAmount amount = smsSalesBillAmountService.selByBillSid(sid);
|
SmsSalesBillAmount amount = smsSalesBillAmountService.selByBillSid(sid);
|
||||||
if (null != amount) {
|
if (null != amount) {
|
||||||
BeanUtil.copyProperties(amount,vo,"id","sid","createBySid","createTime");
|
BeanUtil.copyProperties(amount, vo, "id", "sid", "createBySid", "createTime");
|
||||||
}
|
}
|
||||||
|
|
||||||
List<SmsSalesBillDetail> goods = smsSalesBillDetailService.selByBillSid(sid);
|
List<SmsSalesBillDetail> goods = smsSalesBillDetailService.selByBillSid(sid);
|
||||||
if (!goods.isEmpty()) {
|
if (!goods.isEmpty()) {
|
||||||
for (SmsSalesBillDetail detail : goods) {
|
for (SmsSalesBillDetail detail : goods) {
|
||||||
SmsSalesBillDetailDetailsVo detailVo = new SmsSalesBillDetailDetailsVo();
|
SmsSalesBillDetailDetailsVo detailVo = new SmsSalesBillDetailDetailsVo();
|
||||||
BeanUtil.copyProperties(detail,detailVo,"id","sid");
|
BeanUtil.copyProperties(detail, detailVo, "id", "sid");
|
||||||
|
if (StringUtils.isNotBlank(detail.getGoodsImgUrl())) {
|
||||||
|
List<String> 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);
|
goodsList.add(detailVo);
|
||||||
}
|
}
|
||||||
vo.setGoodsList(goodsList);
|
vo.setGoodsList(goodsList);
|
||||||
}
|
}
|
||||||
SmsSalesBillInvoice invoice = smsSalesBillInvoiceService.selByBillSid(sid);
|
SmsSalesBillInvoice invoice = smsSalesBillInvoiceService.selByBillSid(sid);
|
||||||
if (null != invoice) {
|
if (null != invoice) {
|
||||||
BeanUtil.copyProperties(invoice,vo,"id","sid","createBySid","createTime");
|
BeanUtil.copyProperties(invoice, vo, "id", "sid", "createBySid", "createTime");
|
||||||
}
|
}
|
||||||
SmsSalesBillLogistics logistics = smsSalesBillLogisticsService.selByBillSid(sid);
|
SmsSalesBillLogistics logistics = smsSalesBillLogisticsService.selByBillSid(sid);
|
||||||
if (null != logistics) {
|
if (null != logistics) {
|
||||||
BeanUtil.copyProperties(logistics,vo,"id","sid","createBySid","createTime");
|
BeanUtil.copyProperties(logistics, vo, "id", "sid", "createBySid", "createTime");
|
||||||
}
|
}
|
||||||
SmsSalesBillshipper billshipper = smsSalesBillshipperService.selByBillSid(sid);
|
SmsSalesBillshipper billshipper = smsSalesBillshipperService.selByBillSid(sid);
|
||||||
if (null != billshipper) {
|
if (null != billshipper) {
|
||||||
BeanUtil.copyProperties(billshipper,vo,"id","sid","createBySid","createTime");
|
BeanUtil.copyProperties(billshipper, vo, "id", "sid", "createBySid", "createTime");
|
||||||
}
|
}
|
||||||
List<FileQueryUrl> fileQueryUrls = new ArrayList<>();
|
List<FileQueryUrl> fileQueryUrls = new ArrayList<>();
|
||||||
List<SmsAppendixDetailsVo> smsAppendixDetailsVos = smsAppendixService.selByLinkSid(sid);
|
List<SmsAppendixDetailsVo> smsAppendixDetailsVos = smsAppendixService.selByLinkSid(sid);
|
||||||
|
|||||||
@@ -56,6 +56,8 @@ public class SmsSalesBillAccount extends BaseEntity {
|
|||||||
private String billSid; // 单据sid
|
private String billSid; // 单据sid
|
||||||
@ApiModelProperty("结算账户")
|
@ApiModelProperty("结算账户")
|
||||||
private String bankAccount; // 结算账户
|
private String bankAccount; // 结算账户
|
||||||
|
@ApiModelProperty("结算账户")
|
||||||
|
private String bankAccountKey; // 结算账户
|
||||||
@ApiModelProperty("结算金额")
|
@ApiModelProperty("结算金额")
|
||||||
private BigDecimal amount; // 结算金额
|
private BigDecimal amount; // 结算金额
|
||||||
|
|
||||||
|
|||||||
@@ -76,5 +76,10 @@ public class SmsSalesBillAmount extends BaseEntity {
|
|||||||
private BigDecimal totalDebt; // 总欠款
|
private BigDecimal totalDebt; // 总欠款
|
||||||
@ApiModelProperty("预收款余额")
|
@ApiModelProperty("预收款余额")
|
||||||
private BigDecimal advanceBalance; // 预收款余额
|
private BigDecimal advanceBalance; // 预收款余额
|
||||||
|
@ApiModelProperty("买家实付")
|
||||||
|
private BigDecimal realPay; // 买家实付
|
||||||
|
@ApiModelProperty("服务费")
|
||||||
|
private BigDecimal serviceAmount; // 服务费
|
||||||
|
@ApiModelProperty("声明价值(保值)")
|
||||||
|
private BigDecimal declaredValue; // 声明价值(保值)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,12 +26,14 @@
|
|||||||
package com.yxt.sales.biz.smssalesbilldetail;
|
package com.yxt.sales.biz.smssalesbilldetail;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.yxt.common.core.domain.BaseEntity;
|
import com.yxt.common.core.domain.BaseEntity;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Project: ss-sales(ss-sales) <br/>
|
* Project: ss-sales(ss-sales) <br/>
|
||||||
@@ -92,5 +94,26 @@ public class SmsSalesBillDetail extends BaseEntity {
|
|||||||
private BigDecimal amount; // 惠后金额
|
private BigDecimal amount; // 惠后金额
|
||||||
@ApiModelProperty("库存数量")
|
@ApiModelProperty("库存数量")
|
||||||
private BigDecimal inventoryCount; // 库存数量
|
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; // 总税额(未含税总额)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,6 +33,8 @@ import io.swagger.annotations.ApiModelProperty;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Project: ss-sales(ss-sales) <br/>
|
* Project: ss-sales(ss-sales) <br/>
|
||||||
@@ -93,4 +95,22 @@ public class SmsSalesBillDetailDetailsVo implements Vo {
|
|||||||
private String inventoryCount; // 库存数量
|
private String inventoryCount; // 库存数量
|
||||||
@ApiModelProperty("备注")
|
@ApiModelProperty("备注")
|
||||||
private String remarks; // 备注
|
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<String> pic = new ArrayList<>();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillDetailDiscount.java <br/>
|
||||||
|
* Class: com.yxt.sales.api.smssalesbilldetaildiscount.SmsSalesBillDetailDiscount <br/>
|
||||||
|
* Description: 销售订单-优惠. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @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; // 平台规格名称
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillDetailDiscountVo.java <br/>
|
||||||
|
* Class: com.yxt.sales.api.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountVo <br/>
|
||||||
|
* Description: 销售订单-优惠 视图数据对象. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @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; // 平台规格名称
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillDetailDiscountDto.java <br/>
|
||||||
|
* Class: com.yxt.sales.api.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountDto <br/>
|
||||||
|
* Description: 销售订单-优惠 数据传输对象. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @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; // 平台规格名称
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillDetailDiscountMapper.java <br/>
|
||||||
|
* Class: com.yxt.sales.biz.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountMapper <br/>
|
||||||
|
* Description: 销售订单-优惠. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @author liupopo
|
||||||
|
* @version 1.0
|
||||||
|
* @since 1.0
|
||||||
|
*/
|
||||||
|
@Mapper
|
||||||
|
public interface SmsSalesBillDetailDiscountMapper extends BaseMapper<SmsSalesBillDetailDiscount> {
|
||||||
|
|
||||||
|
//@Update("update sms_sales_bill_detail_discount set name=#{msg} where id=#{id}")
|
||||||
|
//IPage<SmsSalesBillDetailDiscountVo> voPage(IPage<SmsSalesBillDetailDiscount> page, @Param(Constants.WRAPPER) QueryWrapper<SmsSalesBillDetailDiscount> qw);
|
||||||
|
|
||||||
|
IPage<SmsSalesBillDetailDiscountVo> selectPageVo(IPage<SmsSalesBillDetailDiscount> page, @Param(Constants.WRAPPER) Wrapper<SmsSalesBillDetailDiscount> qw);
|
||||||
|
|
||||||
|
List<SmsSalesBillDetailDiscountVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SmsSalesBillDetailDiscount> qw);
|
||||||
|
|
||||||
|
@Select("select * from sms_sales_bill_detail_discount")
|
||||||
|
List<SmsSalesBillDetailDiscountVo> selectListVo();
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
<?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="com.yxt.sales.biz.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountMapper">
|
||||||
|
<!-- <where> ${ew.sqlSegment} </where>-->
|
||||||
|
<!-- ${ew.customSqlSegment} -->
|
||||||
|
<select id="selectPageVo" resultType="com.yxt.sales.biz.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountVo">
|
||||||
|
SELECT * FROM sms_sales_bill_detail_discount <where> ${ew.sqlSegment} </where>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<select id="selectListAllVo" resultType="com.yxt.sales.biz.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountVo">
|
||||||
|
SELECT * FROM sms_sales_bill_detail_discount <where> ${ew.sqlSegment} </where>
|
||||||
|
</select>
|
||||||
|
</mapper>
|
||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillDetailDiscountQuery.java <br/>
|
||||||
|
* Class: com.yxt.sales.api.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountQuery <br/>
|
||||||
|
* Description: 销售订单-优惠 查询条件. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @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; // 平台规格名称
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillDetailDiscountService.java <br/>
|
||||||
|
* Class: com.yxt.sales.biz.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountService <br/>
|
||||||
|
* Description: 销售订单-优惠 业务逻辑. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @author liupopo
|
||||||
|
* @version 1.0
|
||||||
|
* @since 1.0
|
||||||
|
*/
|
||||||
|
@Service
|
||||||
|
public class SmsSalesBillDetailDiscountService extends MybatisBaseService<SmsSalesBillDetailDiscountMapper, SmsSalesBillDetailDiscount> {
|
||||||
|
private QueryWrapper<SmsSalesBillDetailDiscount> createQueryWrapper(SmsSalesBillDetailDiscountQuery query) {
|
||||||
|
// todo: 这里根据具体业务调整查询条件
|
||||||
|
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
||||||
|
QueryWrapper<SmsSalesBillDetailDiscount> qw = new QueryWrapper<>();
|
||||||
|
return qw;
|
||||||
|
}
|
||||||
|
|
||||||
|
public PagerVo<SmsSalesBillDetailDiscountVo> listPageVo(PagerQuery<SmsSalesBillDetailDiscountQuery> pq) {
|
||||||
|
SmsSalesBillDetailDiscountQuery query = pq.getParams();
|
||||||
|
QueryWrapper<SmsSalesBillDetailDiscount> qw = createQueryWrapper(query);
|
||||||
|
IPage<SmsSalesBillDetailDiscount> page = PagerUtil.queryToPage(pq);
|
||||||
|
IPage<SmsSalesBillDetailDiscountVo> pagging = baseMapper.selectPageVo(page, qw);
|
||||||
|
PagerVo<SmsSalesBillDetailDiscountVo> 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillDetailDiscountVo.java <br/>
|
||||||
|
* Class: com.yxt.sales.api.smssalesbilldetaildiscount.SmsSalesBillDetailDiscountVo <br/>
|
||||||
|
* Description: 销售订单-优惠 视图数据对象. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @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; // 平台规格名称
|
||||||
|
|
||||||
|
}
|
||||||
@@ -68,5 +68,20 @@ public class SmsSalesBillInvoice extends BaseEntity {
|
|||||||
private String invoiceCode; // 发票代码
|
private String invoiceCode; // 发票代码
|
||||||
@ApiModelProperty("税率")
|
@ApiModelProperty("税率")
|
||||||
private BigDecimal taxRate; // 税率
|
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; // 邮箱
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ package com.yxt.sales.biz.smssalesbilllogistics;
|
|||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.yxt.common.core.domain.BaseEntity;
|
import com.yxt.common.core.domain.BaseEntity;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
@@ -54,6 +56,8 @@ public class SmsSalesBillLogistics extends BaseEntity {
|
|||||||
|
|
||||||
@ApiModelProperty("销售单sid")
|
@ApiModelProperty("销售单sid")
|
||||||
private String billSid; // 销售单sid
|
private String billSid; // 销售单sid
|
||||||
|
@ApiModelProperty("物流公司sid")
|
||||||
|
private String logisticsNameSid; // 物流公司
|
||||||
@ApiModelProperty("物流公司")
|
@ApiModelProperty("物流公司")
|
||||||
private String logisticsName; // 物流公司
|
private String logisticsName; // 物流公司
|
||||||
@ApiModelProperty("物流单号")
|
@ApiModelProperty("物流单号")
|
||||||
@@ -71,5 +75,28 @@ public class SmsSalesBillLogistics extends BaseEntity {
|
|||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
||||||
@ApiModelProperty("预计送达时间")
|
@ApiModelProperty("预计送达时间")
|
||||||
private Date deliveryDate; // 预计送达时间
|
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; // 应推时间
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,5 +76,11 @@ public class SmsSalesBillshipper extends BaseEntity {
|
|||||||
private String shopName; // 店铺名称
|
private String shopName; // 店铺名称
|
||||||
@ApiModelProperty("买家留言")
|
@ApiModelProperty("买家留言")
|
||||||
private String buyerMessage; // 买家留言
|
private String buyerMessage; // 买家留言
|
||||||
|
@ApiModelProperty("真实姓名")
|
||||||
|
private String name; // 真实姓名
|
||||||
|
@ApiModelProperty("身份证号码")
|
||||||
|
private String idNo; // 身份证号码
|
||||||
|
@ApiModelProperty("固定电话")
|
||||||
|
private String phone; // 固定电话
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillShop.java <br/>
|
||||||
|
* Class: com.yxt.sales.api.smssalesbillshop.SmsSalesBillShop <br/>
|
||||||
|
* Description: 销售订单-店铺信息. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @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; // 原始单号
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillShopVo.java <br/>
|
||||||
|
* Class: com.yxt.sales.api.smssalesbillshop.SmsSalesBillShopVo <br/>
|
||||||
|
* Description: 销售订单-店铺信息 视图数据对象. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @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; // 原始单号
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillShopDto.java <br/>
|
||||||
|
* Class: com.yxt.sales.api.smssalesbillshop.SmsSalesBillShopDto <br/>
|
||||||
|
* Description: 销售订单-店铺信息 数据传输对象. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @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; // 原始单号
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillShopMapper.java <br/>
|
||||||
|
* Class: com.yxt.sales.biz.smssalesbillshop.SmsSalesBillShopMapper <br/>
|
||||||
|
* Description: 销售订单-店铺信息. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @author liupopo
|
||||||
|
* @version 1.0
|
||||||
|
* @since 1.0
|
||||||
|
*/
|
||||||
|
@Mapper
|
||||||
|
public interface SmsSalesBillShopMapper extends BaseMapper<SmsSalesBillShop> {
|
||||||
|
|
||||||
|
//@Update("update sms_sales_bill_shop set name=#{msg} where id=#{id}")
|
||||||
|
//IPage<SmsSalesBillShopVo> voPage(IPage<SmsSalesBillShop> page, @Param(Constants.WRAPPER) QueryWrapper<SmsSalesBillShop> qw);
|
||||||
|
|
||||||
|
IPage<SmsSalesBillShopVo> selectPageVo(IPage<SmsSalesBillShop> page, @Param(Constants.WRAPPER) Wrapper<SmsSalesBillShop> qw);
|
||||||
|
|
||||||
|
List<SmsSalesBillShopVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SmsSalesBillShop> qw);
|
||||||
|
|
||||||
|
@Select("select * from sms_sales_bill_shop")
|
||||||
|
List<SmsSalesBillShopVo> selectListVo();
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
<?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="com.yxt.sales.biz.smssalesbillshop.SmsSalesBillShopMapper">
|
||||||
|
<!-- <where> ${ew.sqlSegment} </where>-->
|
||||||
|
<!-- ${ew.customSqlSegment} -->
|
||||||
|
<select id="selectPageVo" resultType="com.yxt.sales.biz.smssalesbillshop.SmsSalesBillShopVo">
|
||||||
|
SELECT * FROM sms_sales_bill_shop <where> ${ew.sqlSegment} </where>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<select id="selectListAllVo" resultType="com.yxt.sales.biz.smssalesbillshop.SmsSalesBillShopVo">
|
||||||
|
SELECT * FROM sms_sales_bill_shop <where> ${ew.sqlSegment} </where>
|
||||||
|
</select>
|
||||||
|
</mapper>
|
||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillShopQuery.java <br/>
|
||||||
|
* Class: com.yxt.sales.api.smssalesbillshop.SmsSalesBillShopQuery <br/>
|
||||||
|
* Description: 销售订单-店铺信息 查询条件. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @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; // 原始单号
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillShopService.java <br/>
|
||||||
|
* Class: com.yxt.sales.biz.smssalesbillshop.SmsSalesBillShopService <br/>
|
||||||
|
* Description: 销售订单-店铺信息 业务逻辑. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @author liupopo
|
||||||
|
* @version 1.0
|
||||||
|
* @since 1.0
|
||||||
|
*/
|
||||||
|
@Service
|
||||||
|
public class SmsSalesBillShopService extends MybatisBaseService<SmsSalesBillShopMapper, SmsSalesBillShop> {
|
||||||
|
private QueryWrapper<SmsSalesBillShop> createQueryWrapper(SmsSalesBillShopQuery query) {
|
||||||
|
// todo: 这里根据具体业务调整查询条件
|
||||||
|
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
||||||
|
QueryWrapper<SmsSalesBillShop> qw = new QueryWrapper<>();
|
||||||
|
return qw;
|
||||||
|
}
|
||||||
|
|
||||||
|
public PagerVo<SmsSalesBillShopVo> listPageVo(PagerQuery<SmsSalesBillShopQuery> pq) {
|
||||||
|
SmsSalesBillShopQuery query = pq.getParams();
|
||||||
|
QueryWrapper<SmsSalesBillShop> qw = createQueryWrapper(query);
|
||||||
|
IPage<SmsSalesBillShop> page = PagerUtil.queryToPage(pq);
|
||||||
|
IPage<SmsSalesBillShopVo> pagging = baseMapper.selectPageVo(page, qw);
|
||||||
|
PagerVo<SmsSalesBillShopVo> 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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(销售单) <br/>
|
||||||
|
* File: SmsSalesBillShopVo.java <br/>
|
||||||
|
* Class: com.yxt.sales.api.smssalesbillshop.SmsSalesBillShopVo <br/>
|
||||||
|
* Description: 销售订单-店铺信息 视图数据对象. <br/>
|
||||||
|
* Copyright: Copyright (c) 2011 <br/>
|
||||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||||
|
* Makedate: 2024-07-23 14:15:29 <br/>
|
||||||
|
*
|
||||||
|
* @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; // 原始单号
|
||||||
|
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user