01/14
This commit is contained in:
@@ -35,5 +35,6 @@ public interface VegeCellarReserveOrderMapper extends BaseMapper<VegeCellarReser
|
||||
IPage<ReserveOrderVo> pageOfAll(IPage<VegeCellarReserveOrder> page,@Param(Constants.WRAPPER) QueryWrapper<VegeCellarReserveOrder> qw);
|
||||
|
||||
List<ReserveOrderVo> pageOfAll(@Param(Constants.WRAPPER) QueryWrapper<VegeCellarReserveOrder> qw);
|
||||
Integer updateStateInSid(List<String>sids,@Param("state")String state );
|
||||
|
||||
}
|
||||
|
||||
@@ -213,5 +213,12 @@
|
||||
GROUP BY vo.reserveDate,vd.goodsSid
|
||||
ORDER BY vo.reserveDate ASC
|
||||
</select>
|
||||
|
||||
<update id="updateStateInSid">
|
||||
UPDATE vege_cellar_reserve_order
|
||||
SET state=#{state}
|
||||
where sid in
|
||||
<foreach collection="sids" item="item" index="index" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</update>
|
||||
</mapper>
|
||||
@@ -45,5 +45,9 @@ public class VegeCellarReserveOrderRest {
|
||||
public ResultBean<PagerVo<VegeCellarReserveOrderVo>> orderListByUserSid(@RequestBody PagerQuery<VegeCellarReserveOrderQuery> pq) {
|
||||
return vegeCellarReserveOrderService.orderListByUserSid(pq);
|
||||
}
|
||||
|
||||
@ApiOperation("定时查询预约状态")
|
||||
@PostMapping("/getReserveBySid")
|
||||
public ResultBean<PagerVo<VegeCellarReserveOrderVo>> getReserveBySid(@RequestBody PagerQuery<VegeCellarReserveOrderQuery> pq) {
|
||||
return vegeCellarReserveOrderService.orderListByUserSid(pq);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,9 +34,9 @@ import com.yxt.ordermall.biz.vegetablecellar.VegetableCellarService;
|
||||
import com.yxt.ordermall.feign.base.basebrandinfo.BaseBrandInfoFeign;
|
||||
import com.yxt.ordermall.feign.base.basegoodssku.BaseGoodsSkuFeign;
|
||||
import com.yxt.ordermall.feign.portal.sysorganization.SysOrganizationFeign;
|
||||
import com.yxt.ordermall.feign.purchase.purchasebill.PurchaseBillDetailDto;
|
||||
import com.yxt.ordermall.feign.purchase.purchasebill.PurchaseBillDto;
|
||||
import com.yxt.ordermall.feign.purchase.purchasebill.PurchaseBillFeign;
|
||||
import com.yxt.ordermall.feign.purchase.purchasebill.*;
|
||||
import com.yxt.ordermall.feign.sales.smssalesbill.SmsSalesBillDto;
|
||||
import com.yxt.ordermall.feign.sales.smssalesbill.SmsSalesBillFeign;
|
||||
import com.yxt.ordermall.feign.warehouse.warehouseinfo.WarehouseInfoFeign;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -51,6 +51,7 @@ import java.time.ZoneId;
|
||||
import java.util.*;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
@@ -79,6 +80,8 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
|
||||
PurchaseBillFeign purchaseBillFeign;
|
||||
@Autowired
|
||||
SysOrganizationFeign sysOrganizationFeign;
|
||||
@Autowired
|
||||
SmsSalesBillFeign smsSalesBillFeign;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResultBean submission(VegeCellarReserveOrderDto dto) {
|
||||
@@ -555,6 +558,53 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
|
||||
});
|
||||
return listRes;
|
||||
}
|
||||
public void getReserveBySid() {
|
||||
List<VegeCellarReserveOrder> state = baseMapper.selectList(new QueryWrapper<VegeCellarReserveOrder>().eq("state", "0"));
|
||||
ResultBean<List<PurchaseBillDetailsVo>> listResultBean = purchaseBillFeign.fetchDetailsBySourceSid(state.stream().map(s -> s.getSid()).collect(Collectors.toList()));
|
||||
List<String> collect1 = listResultBean.getData().stream().filter(s -> s.getState().equals("0")).map(s->s.getSourceBillSid()).collect(Collectors.toList());
|
||||
List<String> collect2 = listResultBean.getData().stream().filter(s -> s.getState().equals("1")).map(s->s.getSourceBillSid()).collect(Collectors.toList());
|
||||
List<String> collect3 = listResultBean.getData().stream().filter(s -> s.getState().equals("2")).map(s->s.getSourceBillSid()).collect(Collectors.toList());
|
||||
List<String> collect4 = listResultBean.getData().stream().filter(s -> s.getState().equals("3")).map(s->s.getSourceBillSid()).collect(Collectors.toList());
|
||||
if(collect1.size()!=0){
|
||||
baseMapper.updateStateInSid(collect3,"0");
|
||||
}
|
||||
//审核中
|
||||
if(collect2.size()!=0){
|
||||
baseMapper.updateStateInSid(collect3,"1");
|
||||
}
|
||||
//通过
|
||||
if(collect3.size()!=0){
|
||||
baseMapper.updateStateInSid(collect3,"2");
|
||||
}
|
||||
//未通过
|
||||
if(collect4.size()!=0){
|
||||
cancelReservation(collect4.toArray(new String[0]));
|
||||
}
|
||||
}
|
||||
public void tsxsd(String sid) {
|
||||
List<VegeCellarReserveOrder> state = baseMapper.selectList(new QueryWrapper<VegeCellarReserveOrder>().eq("state", "2"));
|
||||
ResultBean<List<PurchaseBillDetailsVo>> listResultBean = purchaseBillFeign.fetchDetailsBySourceSid(state.stream().map(s -> s.getSid()).collect(Collectors.toList()));
|
||||
List<PurchaseBillDetailsVo> collect = listResultBean.getData().stream().filter(s -> s.getState().equals("0")).collect(Collectors.toList());
|
||||
for (PurchaseBillDetailsVo purchaseBill : collect) {
|
||||
if(purchaseBill.getPurchaseBillExtend().getReceiveStateValue().equals("全部收货")){
|
||||
List<VegeCellarReserveOrder> collect1 = state.stream().filter(s -> s.getSid().equals(purchaseBill.getSourceBillSid())).collect(Collectors.toList());
|
||||
SmsSalesBillDto dto=new SmsSalesBillDto();
|
||||
dto.setUseOrgSid(purchaseBill.getUseOrgSid());
|
||||
dto.setCreateOrgSid(purchaseBill.getCreateOrgSid());
|
||||
dto.setDeptSid(purchaseBill.getDeptSid());
|
||||
dto.setDeptName(purchaseBill.getDeptName());
|
||||
dto.setWarehouseName(purchaseBill.getWareHouseName());
|
||||
dto.setWarehouseSid(purchaseBill.getWareHouseSid());
|
||||
dto.setBillTypeKey("预售订单");
|
||||
dto.setBillTypeValue("预售订单");
|
||||
dto.setDeliveryTypeKey("自取");
|
||||
dto.setDeliveryTypeValue("自取");
|
||||
smsSalesBillFeign.save(dto);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
/**
|
||||
* 单号每四位加空格
|
||||
* @param
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
/*********************************************************
|
||||
*********************************************************
|
||||
******************** *******************
|
||||
************* ************
|
||||
******* _oo0oo_ *******
|
||||
*** o8888888o ***
|
||||
* 88" . "88 *
|
||||
* (| -_- |) *
|
||||
* 0\ = /0 *
|
||||
* ___/`---'\___ *
|
||||
* .' \\| |// '. *
|
||||
* / \\||| : |||// \ *
|
||||
* / _||||| -:- |||||- \ *
|
||||
* | | \\\ - /// | | *
|
||||
* | \_| ''\---/'' |_/ | *
|
||||
* \ .-\__ '-' ___/-. / *
|
||||
* ___'. .' /--.--\ `. .'___ *
|
||||
* ."" '< `.___\_<|>_/___.' >' "". *
|
||||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
|
||||
* \ \ `_. \_ __\ /__ _/ .-` / / *
|
||||
* =====`-.____`.___ \_____/___.-`___.-'===== *
|
||||
* `=---=' *
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
|
||||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
|
||||
*********************************************************/
|
||||
package com.yxt.ordermall.feign.purchase.purchasebill;
|
||||
|
||||
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.util.Date;
|
||||
|
||||
@Data
|
||||
@ApiModel(value = "采购单", description = "采购单")
|
||||
@TableName("purchase_bill")
|
||||
public class PurchaseBill extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("制单人姓名")
|
||||
private String createByName; // 制单人姓名
|
||||
@ApiModelProperty("来源单sid(工单sid)")
|
||||
private String sourceBillSid; // 来源单sid(工单sid)
|
||||
@ApiModelProperty("来源单编号/外部编号")
|
||||
private String sourceBillNo; // 来源单编号/外部编号
|
||||
@ApiModelProperty("单据编号")
|
||||
private String billNo; // 单据编号
|
||||
@ApiModelProperty("采购类型Key")
|
||||
private String purchaseTypeKey; // 采购类型Key
|
||||
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
|
||||
private String purchaseTypeValue; // 采购类型Value(厂家采购、外采、其他)
|
||||
@ApiModelProperty("采购原因key")
|
||||
private String purchaseReasonKey; // 采购原因key
|
||||
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
|
||||
private String purchaseReasonValue; // 采购原因(储备/客户订单/在修车辆)
|
||||
@ApiModelProperty("付款方式key")
|
||||
private String payTypeKey; // 付款方式key
|
||||
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
|
||||
private String payTypeValue; // 付款方式value(预付款/月结/单笔付款)
|
||||
@ApiModelProperty("供应商sid")
|
||||
private String supplierSid; // 供应商sid
|
||||
@ApiModelProperty("供应商名称")
|
||||
private String supplierName; // 供应商名称
|
||||
@ApiModelProperty("供应商联系电话")
|
||||
private String supplierPhone; // 供应商联系电话
|
||||
@ApiModelProperty("采购员sid(单选)")
|
||||
private String purchaserSid; // 采购员sid(单选)
|
||||
@ApiModelProperty("采购员姓名")
|
||||
private String purchaserName; // 采购员姓名
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
||||
@ApiModelProperty("预计到货日期")
|
||||
private Date deliveryDate; // 预计到货日期
|
||||
@ApiModelProperty("仓库sid")
|
||||
private String wareHouseSid;
|
||||
@ApiModelProperty("仓库名称")
|
||||
private String wareHouseName;
|
||||
@ApiModelProperty("使用组织sid")
|
||||
private String useOrgSid;
|
||||
@ApiModelProperty("创建组织sid")
|
||||
private String createOrgSid;
|
||||
@ApiModelProperty("创建部门sid")
|
||||
private String deptSid;
|
||||
@ApiModelProperty("创建部门")
|
||||
private String deptName;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
/*********************************************************
|
||||
*********************************************************
|
||||
******************** *******************
|
||||
************* ************
|
||||
******* _oo0oo_ *******
|
||||
*** o8888888o ***
|
||||
* 88" . "88 *
|
||||
* (| -_- |) *
|
||||
* 0\ = /0 *
|
||||
* ___/`---'\___ *
|
||||
* .' \\| |// '. *
|
||||
* / \\||| : |||// \ *
|
||||
* / _||||| -:- |||||- \ *
|
||||
* | | \\\ - /// | | *
|
||||
* | \_| ''\---/'' |_/ | *
|
||||
* \ .-\__ '-' ___/-. / *
|
||||
* ___'. .' /--.--\ `. .'___ *
|
||||
* ."" '< `.___\_<|>_/___.' >' "". *
|
||||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
|
||||
* \ \ `_. \_ __\ /__ _/ .-` / / *
|
||||
* =====`-.____`.___ \_____/___.-`___.-'===== *
|
||||
* `=---=' *
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
|
||||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
|
||||
*********************************************************/
|
||||
package com.yxt.ordermall.feign.purchase.purchasebill;
|
||||
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import com.yxt.purchase.biz.purchaseappendix.PurchaseAppendixUrl;
|
||||
import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDetailsVo;
|
||||
import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailDetailsVo;
|
||||
import com.yxt.purchase.biz.purchasebillextend.PurchaseBillExtendDetailsVo;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@ApiModel(value = "采购单 视图数据详情", description = "采购单 视图数据详情")
|
||||
public class PurchaseBillDetailsVo implements Vo {
|
||||
|
||||
private String sid;
|
||||
private String state;
|
||||
@ApiModelProperty("备注")
|
||||
private String remarks;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
|
||||
@ApiModelProperty("创建时间")
|
||||
private Date createTime;
|
||||
@ApiModelProperty("制单人sid")
|
||||
private String createBySid;
|
||||
@ApiModelProperty("制单人姓名")
|
||||
private String createByName; // 制单人姓名
|
||||
@ApiModelProperty("来源单sid(工单sid)")
|
||||
private String sourceBillSid; // 来源单sid(工单sid)
|
||||
@ApiModelProperty("来源单编号/外部编号")
|
||||
private String sourceBillNo; // 来源单编号/外部编号
|
||||
@ApiModelProperty("单据编号")
|
||||
private String billNo; // 单据编号
|
||||
@ApiModelProperty("采购类型Key")
|
||||
private String purchaseTypeKey; // 采购类型Key
|
||||
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
|
||||
private String purchaseTypeValue; // 采购类型Value(厂家采购、外采、其他)
|
||||
@ApiModelProperty("采购原因key")
|
||||
private String purchaseReasonKey; // 采购原因key
|
||||
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
|
||||
private String purchaseReasonValue; // 采购原因(储备/客户订单/在修车辆)
|
||||
@ApiModelProperty("付款方式key")
|
||||
private String payTypeKey; // 付款方式key
|
||||
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
|
||||
private String payTypeValue; // 付款方式value(预付款/月结/单笔付款)
|
||||
@ApiModelProperty("供应商sid")
|
||||
private String supplierSid; // 供应商sid
|
||||
@ApiModelProperty("供应商名称")
|
||||
private String supplierName; // 供应商名称
|
||||
@ApiModelProperty("供应商联系电话")
|
||||
private String supplierPhone; // 供应商联系电话
|
||||
@ApiModelProperty("采购员sid(单选)")
|
||||
private String purchaserSid; // 采购员sid(单选)
|
||||
@ApiModelProperty("采购员姓名")
|
||||
private String purchaserName; // 采购员姓名
|
||||
@ApiModelProperty("预计到货日期")
|
||||
private String deliveryDate;
|
||||
@ApiModelProperty("仓库sid")
|
||||
private String wareHouseSid;
|
||||
@ApiModelProperty("仓库名称")
|
||||
private String wareHouseName;
|
||||
@ApiModelProperty("使用组织sid")
|
||||
private String useOrgSid;
|
||||
@ApiModelProperty("创建组织sid")
|
||||
private String createOrgSid;
|
||||
@ApiModelProperty("创建部门sid")
|
||||
private String deptSid;
|
||||
@ApiModelProperty("创建部门")
|
||||
private String deptName;
|
||||
|
||||
|
||||
@ApiModelProperty("采购单扩展")
|
||||
private PurchaseBillExtendDetailsVo purchaseBillExtend;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
/*********************************************************
|
||||
*********************************************************
|
||||
******************** *******************
|
||||
************* ************
|
||||
******* _oo0oo_ *******
|
||||
*** o8888888o ***
|
||||
* 88" . "88 *
|
||||
* (| -_- |) *
|
||||
* 0\ = /0 *
|
||||
* ___/`---'\___ *
|
||||
* .' \\| |// '. *
|
||||
* / \\||| : |||// \ *
|
||||
* / _||||| -:- |||||- \ *
|
||||
* | | \\\ - /// | | *
|
||||
* | \_| ''\---/'' |_/ | *
|
||||
* \ .-\__ '-' ___/-. / *
|
||||
* ___'. .' /--.--\ `. .'___ *
|
||||
* ."" '< `.___\_<|>_/___.' >' "". *
|
||||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
|
||||
* \ \ `_. \_ __\ /__ _/ .-` / / *
|
||||
* =====`-.____`.___ \_____/___.-`___.-'===== *
|
||||
* `=---=' *
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
|
||||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
|
||||
*********************************************************/
|
||||
package com.yxt.ordermall.feign.purchase.purchasebill;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
@ApiModel(value = "采购单扩展 视图数据详情", description = "采购单扩展 视图数据详情")
|
||||
public class PurchaseBillExtendDetailsVo implements Vo {
|
||||
|
||||
private String sid; // sid
|
||||
|
||||
@ApiModelProperty("采购单sid")
|
||||
private String billSid; // 采购单sid
|
||||
@ApiModelProperty("物流单号")
|
||||
private String logisticsNum; // 物流单号
|
||||
@ApiModelProperty("生产进度")
|
||||
private String productProgress; // 生产进度
|
||||
@ApiModelProperty("收货状态key")
|
||||
private String receiveStateKey; // 收货状态
|
||||
@ApiModelProperty("收货状态value")
|
||||
private String receiveStateValue;
|
||||
@ApiModelProperty("发货状态key")
|
||||
private String deliveryStateKey; // 发货状态
|
||||
@ApiModelProperty("发货状态value")
|
||||
private String deliveryStateValue;
|
||||
|
||||
@ApiModelProperty("已发货数量")
|
||||
private BigDecimal deliveryCount;
|
||||
}
|
||||
@@ -7,6 +7,8 @@ import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@FeignClient(
|
||||
contextId = "ss-common-purchase-PurchaseBill",
|
||||
name = "ss-common-purchase",
|
||||
@@ -29,4 +31,8 @@ public interface PurchaseBillFeign {
|
||||
@ApiOperation("采购单审核")
|
||||
@PostMapping("/examine")
|
||||
public ResultBean examine(@RequestParam("sid") String sid,@RequestParam("state") String state,@RequestParam("remarks") String remarks);
|
||||
@ApiOperation("根据来源单SID获取一条记录")
|
||||
@PostMapping("/fetchDetailsBySourceSid")
|
||||
public ResultBean<List<PurchaseBillDetailsVo>> fetchDetailsBySourceSid(@RequestBody List<String> sids);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
/*********************************************************
|
||||
*********************************************************
|
||||
******************** *******************
|
||||
************* ************
|
||||
******* _oo0oo_ *******
|
||||
*** o8888888o ***
|
||||
* 88" . "88 *
|
||||
* (| -_- |) *
|
||||
* 0\ = /0 *
|
||||
* ___/`---'\___ *
|
||||
* .' \\| |// '. *
|
||||
* / \\||| : |||// \ *
|
||||
* / _||||| -:- |||||- \ *
|
||||
* | | \\\ - /// | | *
|
||||
* | \_| ''\---/'' |_/ | *
|
||||
* \ .-\__ '-' ___/-. / *
|
||||
* ___'. .' /--.--\ `. .'___ *
|
||||
* ."" '< `.___\_<|>_/___.' >' "". *
|
||||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
|
||||
* \ \ `_. \_ __\ /__ _/ .-` / / *
|
||||
* =====`-.____`.___ \_____/___.-`___.-'===== *
|
||||
* `=---=' *
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
|
||||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
|
||||
*********************************************************/
|
||||
package com.yxt.ordermall.feign.sales.smssalesbill;
|
||||
|
||||
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: ss-sales(ss-sales) <br/>
|
||||
* File: SmsSalesBillAmount.java <br/>
|
||||
* Class: com.yxt.sales.apiadmin.api.smssalesbillamount.SmsSalesBillAmount <br/>
|
||||
* Description: 销售订单-费用. <br/>
|
||||
* Copyright: Copyright (c) 2011 <br/>
|
||||
* Company: https://gitee.com/liuzp315 <br/>
|
||||
* Makedate: 2024-07-04 15:18:10 <br/>
|
||||
*
|
||||
* @author liupopo
|
||||
* @version 1.0
|
||||
* @since 1.0
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "销售订单-费用", description = "销售订单-费用")
|
||||
@TableName("sms_sales_bill_amount")
|
||||
public class SmsSalesBillAmount extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("单据sid")
|
||||
private String billSid; // 单据sid
|
||||
@ApiModelProperty("折扣率")
|
||||
private BigDecimal discountRate; // 折扣率
|
||||
@ApiModelProperty("整体优惠券")
|
||||
private BigDecimal coupon; // 整体优惠券
|
||||
@ApiModelProperty("整体优惠金额")
|
||||
private BigDecimal discountAmount; // 整体优惠金额
|
||||
@ApiModelProperty("优惠后金额")
|
||||
private BigDecimal amount; // 优惠后金额
|
||||
@ApiModelProperty("应收合计")
|
||||
private BigDecimal dueAmount; // 应收合计
|
||||
@ApiModelProperty("运费")
|
||||
private BigDecimal freight; // 运费
|
||||
@ApiModelProperty("是否货到付款(1是,0否)")
|
||||
private Integer isFirstPay; // 是否货到付款(1是,0否)
|
||||
@ApiModelProperty("本次收款")
|
||||
private BigDecimal thisPay; // 本次收款
|
||||
@ApiModelProperty("本次欠款")
|
||||
private BigDecimal thisDebt; // 本次欠款
|
||||
@ApiModelProperty("总欠款")
|
||||
private BigDecimal totalDebt; // 总欠款
|
||||
@ApiModelProperty("预收款余额")
|
||||
private BigDecimal advanceBalance; // 预收款余额
|
||||
@ApiModelProperty("买家实付")
|
||||
private BigDecimal realPay; // 买家实付
|
||||
@ApiModelProperty("服务费")
|
||||
private BigDecimal serviceAmount; // 服务费
|
||||
@ApiModelProperty("声明价值(保值)")
|
||||
private BigDecimal declaredValue; // 声明价值(保值)
|
||||
}
|
||||
@@ -0,0 +1,119 @@
|
||||
/*********************************************************
|
||||
*********************************************************
|
||||
******************** *******************
|
||||
************* ************
|
||||
******* _oo0oo_ *******
|
||||
*** o8888888o ***
|
||||
* 88" . "88 *
|
||||
* (| -_- |) *
|
||||
* 0\ = /0 *
|
||||
* ___/`---'\___ *
|
||||
* .' \\| |// '. *
|
||||
* / \\||| : |||// \ *
|
||||
* / _||||| -:- |||||- \ *
|
||||
* | | \\\ - /// | | *
|
||||
* | \_| ''\---/'' |_/ | *
|
||||
* \ .-\__ '-' ___/-. / *
|
||||
* ___'. .' /--.--\ `. .'___ *
|
||||
* ."" '< `.___\_<|>_/___.' >' "". *
|
||||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
|
||||
* \ \ `_. \_ __\ /__ _/ .-` / / *
|
||||
* =====`-.____`.___ \_____/___.-`___.-'===== *
|
||||
* `=---=' *
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
|
||||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
|
||||
*********************************************************/
|
||||
package com.yxt.ordermall.feign.sales.smssalesbill;
|
||||
|
||||
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) <br/>
|
||||
* File: SmsSalesBillDetail.java <br/>
|
||||
* Class: com.yxt.sales.apiadmin.api.smssalesbilldetail.SmsSalesBillDetail <br/>
|
||||
* Description: 销售订单-商品清单. <br/>
|
||||
* Copyright: Copyright (c) 2011 <br/>
|
||||
* Company: https://gitee.com/liuzp315 <br/>
|
||||
* Makedate: 2024-07-04 15:18:10 <br/>
|
||||
*
|
||||
* @author liupopo
|
||||
* @version 1.0
|
||||
* @since 1.0
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "销售订单-商品清单", description = "销售订单-商品清单")
|
||||
@TableName("sms_sales_bill_detail")
|
||||
public class SmsSalesBillDetail extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("工单sid")
|
||||
private String billSid; // 工单sid
|
||||
@ApiModelProperty("商品基础信息Sid")
|
||||
private String goodSpuSid; // 商品基础信息Sid
|
||||
@ApiModelProperty("商品名称")
|
||||
private String goodsSpuName; // 商品名称
|
||||
@ApiModelProperty("商品Skusid")
|
||||
private String goodsSkuSid; // 商品Skusid
|
||||
@ApiModelProperty("商品Sku名称")
|
||||
private String goodsSkuTitle; // 商品Sku名称
|
||||
@ApiModelProperty("商品编码")
|
||||
private String goodsSkuCode; // 商品编码
|
||||
@ApiModelProperty("规格型号")
|
||||
private String goodsSkuOwnSpec; // 规格型号
|
||||
@ApiModelProperty("重量(kg)")
|
||||
private BigDecimal weight; // 重量(kg)
|
||||
@ApiModelProperty("体积(立方米)")
|
||||
private BigDecimal volume; // 体积(立方米)
|
||||
@ApiModelProperty("计量单位")
|
||||
private String unit; // 计量单位
|
||||
@ApiModelProperty("辅单位数量")
|
||||
private String auxiliaryUnit; // 辅单位数量
|
||||
@ApiModelProperty("销售单价")
|
||||
private BigDecimal price; // 销售单价
|
||||
@ApiModelProperty("数量")
|
||||
private BigDecimal count; // 数量
|
||||
@ApiModelProperty("折扣率")
|
||||
private BigDecimal discountRtate; // 折扣率
|
||||
@ApiModelProperty("折后单价")
|
||||
private BigDecimal discountPrice; // 折后单价
|
||||
@ApiModelProperty("应收款")
|
||||
private BigDecimal dueAmount; // 应收款
|
||||
@ApiModelProperty("商品成本")
|
||||
private BigDecimal cost; // 商品成本
|
||||
@ApiModelProperty("分摊优惠")
|
||||
private BigDecimal discountAmount; // 分摊优惠
|
||||
@ApiModelProperty("惠后金额")
|
||||
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; // 总税额(未含税总额)
|
||||
|
||||
}
|
||||
@@ -0,0 +1,185 @@
|
||||
/*********************************************************
|
||||
*********************************************************
|
||||
******************** *******************
|
||||
************* ************
|
||||
******* _oo0oo_ *******
|
||||
*** o8888888o ***
|
||||
* 88" . "88 *
|
||||
* (| -_- |) *
|
||||
* 0\ = /0 *
|
||||
* ___/`---'\___ *
|
||||
* .' \\| |// '. *
|
||||
* / \\||| : |||// \ *
|
||||
* / _||||| -:- |||||- \ *
|
||||
* | | \\\ - /// | | *
|
||||
* | \_| ''\---/'' |_/ | *
|
||||
* \ .-\__ '-' ___/-. / *
|
||||
* ___'. .' /--.--\ `. .'___ *
|
||||
* ."" '< `.___\_<|>_/___.' >' "". *
|
||||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
|
||||
* \ \ `_. \_ __\ /__ _/ .-` / / *
|
||||
* =====`-.____`.___ \_____/___.-`___.-'===== *
|
||||
* `=---=' *
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
|
||||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
|
||||
*********************************************************/
|
||||
package com.yxt.ordermall.feign.sales.smssalesbill;
|
||||
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import com.yxt.sales.biz.smssalesbilldetail.SmsSalesBillDetailDetailsVo;
|
||||
import com.yxt.sales.utils.FileQueryUrl;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Project: ss-sales(ss-sales) <br/>
|
||||
* File: SmsSalesBillDto.java <br/>
|
||||
* Class: com.yxt.sales.apiadmin.api.smssalesbill.SmsSalesBillDto <br/>
|
||||
* Description: 销售订单 数据传输对象. <br/>
|
||||
* Copyright: Copyright (c) 2011 <br/>
|
||||
* Company: https://gitee.com/liuzp315 <br/>
|
||||
* Makedate: 2024-07-04 15:18:10 <br/>
|
||||
*
|
||||
* @author liupopo
|
||||
* @version 1.0
|
||||
* @since 1.0
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "销售订单 数据传输对象", description = "销售订单 数据传输对象")
|
||||
public class SmsSalesBillDto implements Dto {
|
||||
|
||||
private String sid; // sid
|
||||
@ApiModelProperty("制单人sid")
|
||||
private String createBySid; // 制单人姓名
|
||||
@ApiModelProperty("制单人姓名")
|
||||
private String createByName; // 制单人姓名
|
||||
@ApiModelProperty("使用组织sid")
|
||||
private String useOrgSid; // 使用组织sid
|
||||
@ApiModelProperty("创建组织sid")
|
||||
private String createOrgSid; // 创建组织sid
|
||||
@ApiModelProperty("制单部门sid")
|
||||
private String deptSid; // 制单部门sid
|
||||
@ApiModelProperty("制单部门")
|
||||
private String deptName; // 制单部门
|
||||
@ApiModelProperty("制单日期")
|
||||
private String createTime; // 制单日期
|
||||
@ApiModelProperty("单据类型key(线下订单/预售订单等)")
|
||||
private String billTypeKey; // 单据类型key(线下订单/预售订单等)
|
||||
@ApiModelProperty("单据类型value")
|
||||
private String billTypeValue; // 单据类型value
|
||||
@ApiModelProperty("仓库sid")
|
||||
private String warehouseSid; // 仓库sid
|
||||
@ApiModelProperty("仓库名称")
|
||||
private String warehouseName; // 仓库名称
|
||||
@ApiModelProperty("配送方式Key")
|
||||
private String deliveryTypeKey; // 配送方式Key
|
||||
@ApiModelProperty("配送方式Value")
|
||||
private String deliveryTypeValue; // 配送方式Value
|
||||
@ApiModelProperty("物流公司")
|
||||
private String logisticsName; // 物流公司
|
||||
@ApiModelProperty("销售用户sid单选)(销售用户sid)")
|
||||
private String salesUserSid; // 销售用户sid单选)(销售用户sid)
|
||||
@ApiModelProperty("销售姓名")
|
||||
private String salesName; // 销售姓名
|
||||
@ApiModelProperty("是否货到付款(1是,0否)")
|
||||
private String isFirstPay; // 是否货到付款(1是,0否)
|
||||
@ApiModelProperty("备注")
|
||||
private String remarks; // 备注
|
||||
@ApiModelProperty("开单价格Key(标准售价、吊牌价、批发价、上次购买价)")
|
||||
private String billPriceTypeKey; // 开单价格Key(标准售价、吊牌价、批发价、上次购买价)
|
||||
@ApiModelProperty("开单价格value")
|
||||
private String billPriceTypeValue; // 开单价格value
|
||||
//-------------- 客户信息 --------------------
|
||||
@ApiModelProperty("客户sid")
|
||||
private String customerSid; // 客户sid
|
||||
@ApiModelProperty("客户名称")
|
||||
private String customerName; // 客户名称
|
||||
@ApiModelProperty("收货人姓名")
|
||||
private String shipperName; // 收货人姓名
|
||||
@ApiModelProperty("收货人手机")
|
||||
private String shipperMob; // 收货人手机
|
||||
@ApiModelProperty("收货省sid")
|
||||
private String deliveryProvinceSid; // 收货省sid
|
||||
@ApiModelProperty("收货省")
|
||||
private String deliveryProvince; // 收货省
|
||||
@ApiModelProperty("收货市sid")
|
||||
private String deliveryCitySid; // 收货市sid
|
||||
@ApiModelProperty("收货市")
|
||||
private String deliveryCity; // 收货市
|
||||
@ApiModelProperty("收货县区sid")
|
||||
private String deliveryCountySid; // 收货县区sid
|
||||
@ApiModelProperty("收货县区")
|
||||
private String deliveryCounty; // 收货县区
|
||||
@ApiModelProperty("收货详细地址")
|
||||
private String deliveryAddress; // 收货详细地址
|
||||
@ApiModelProperty("邮编 ")
|
||||
private String postCode; // 邮编
|
||||
//---------------发票信息------------
|
||||
@ApiModelProperty("是否需要开发票(是1,否0)")
|
||||
private String isInvoicing; // 是否需要开发票(是1,否0)
|
||||
@ApiModelProperty("发票类型Key")
|
||||
private String invoiceTypeKey; // 发票类型Key
|
||||
@ApiModelProperty("发票类型")
|
||||
private String invoiceType; // 发票类型
|
||||
@ApiModelProperty("开票名称")
|
||||
private String invoiceTitle; // 开票名称
|
||||
@ApiModelProperty("税号")
|
||||
private String taxpayerNo; // 税号
|
||||
@ApiModelProperty("税率")
|
||||
private String taxRate; // 税率
|
||||
//商品信息
|
||||
@ApiModelProperty("商品列表")
|
||||
private List<SmsSalesBillDetailDetailsVo> goodsList; // 商品列表
|
||||
|
||||
//费用信息
|
||||
@ApiModelProperty("折扣率")
|
||||
private String discountRate; // 折扣率
|
||||
@ApiModelProperty("整体优惠券")
|
||||
private String coupon; // 整体优惠券
|
||||
@ApiModelProperty("整体优惠金额")
|
||||
private String discountAmount; // 整体优惠金额
|
||||
@ApiModelProperty("优惠后金额")
|
||||
private String amount; // 优惠后金额
|
||||
@ApiModelProperty("应收合计")
|
||||
private String dueAmount; // 应收合计
|
||||
@ApiModelProperty("运费")
|
||||
private String freight; // 运费
|
||||
@ApiModelProperty("本次收款")
|
||||
private String thisPay; // 本次收款
|
||||
@ApiModelProperty("本次欠款")
|
||||
private String thisDebt; // 本次欠款
|
||||
@ApiModelProperty("总欠款")
|
||||
private String totalDebt; // 总欠款
|
||||
@ApiModelProperty("预收款余额")
|
||||
private String advanceBalance; // 预收款余额
|
||||
//结算
|
||||
@ApiModelProperty("结算账户")
|
||||
private List<AccountVo> accounts;
|
||||
@ApiModelProperty("结算账户")
|
||||
private String bankAccount; // 结算账户
|
||||
@ApiModelProperty("结算账户")
|
||||
private String bankAccountKey; // 结算账户
|
||||
@ApiModelProperty("付款凭证")
|
||||
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; // 订单号
|
||||
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.yxt.ordermall.feign.sales.smssalesbill;
|
||||
|
||||
import com.yxt.common.core.query.PagerQuery;
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.common.core.vo.PagerVo;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @description:
|
||||
* @author: fzz
|
||||
* @date: 2024/7/4
|
||||
**/
|
||||
@FeignClient(
|
||||
contextId = "ss-common-sales-SmsSalesBill",
|
||||
name = "ss-common-sales",
|
||||
path = "/v1/smssalesbill",
|
||||
fallback = SmsSalesBillFeignFallback.class)
|
||||
public interface SmsSalesBillFeign {
|
||||
@ApiOperation("新增或修改")
|
||||
@PostMapping("/save")
|
||||
public ResultBean save(@RequestBody SmsSalesBillDto dto);
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.yxt.ordermall.feign.sales.smssalesbill;
|
||||
|
||||
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.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @description:
|
||||
* @author: fzz
|
||||
* @date: 2024/7/4
|
||||
**/
|
||||
@Component
|
||||
public class SmsSalesBillFeignFallback implements SmsSalesBillFeign {
|
||||
|
||||
|
||||
@Override
|
||||
public ResultBean save(SmsSalesBillDto dto) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
/*********************************************************
|
||||
*********************************************************
|
||||
******************** *******************
|
||||
************* ************
|
||||
******* _oo0oo_ *******
|
||||
*** o8888888o ***
|
||||
* 88" . "88 *
|
||||
* (| -_- |) *
|
||||
* 0\ = /0 *
|
||||
* ___/`---'\___ *
|
||||
* .' \\| |// '. *
|
||||
* / \\||| : |||// \ *
|
||||
* / _||||| -:- |||||- \ *
|
||||
* | | \\\ - /// | | *
|
||||
* | \_| ''\---/'' |_/ | *
|
||||
* \ .-\__ '-' ___/-. / *
|
||||
* ___'. .' /--.--\ `. .'___ *
|
||||
* ."" '< `.___\_<|>_/___.' >' "". *
|
||||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
|
||||
* \ \ `_. \_ __\ /__ _/ .-` / / *
|
||||
* =====`-.____`.___ \_____/___.-`___.-'===== *
|
||||
* `=---=' *
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
|
||||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
|
||||
*********************************************************/
|
||||
package com.yxt.ordermall.feign.sales.smssalesbill;
|
||||
|
||||
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: ss-sales(ss-sales) <br/>
|
||||
* File: SmsSalesBillInvoice.java <br/>
|
||||
* Class: com.yxt.sales.apiadmin.api.smssalesbillinvoice.SmsSalesBillInvoice <br/>
|
||||
* Description: 销售订单-发票. <br/>
|
||||
* Copyright: Copyright (c) 2011 <br/>
|
||||
* Company: https://gitee.com/liuzp315 <br/>
|
||||
* Makedate: 2024-07-04 15:18:10 <br/>
|
||||
*
|
||||
* @author liupopo
|
||||
* @version 1.0
|
||||
* @since 1.0
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "销售订单-发票", description = "销售订单-发票")
|
||||
@TableName("sms_sales_bill_invoice")
|
||||
public class SmsSalesBillInvoice extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("销售单sid")
|
||||
private String billSid; // 销售单sid
|
||||
@ApiModelProperty("是否需要开发票(是1,否0)")
|
||||
private Integer isInvoicing; // 是否需要开发票(是1,否0)
|
||||
@ApiModelProperty("发票类型Key")
|
||||
private String invoiceTypeKey; // 发票类型Key
|
||||
@ApiModelProperty("发票类型")
|
||||
private String invoiceType; // 发票类型
|
||||
@ApiModelProperty("开票名称")
|
||||
private String invoiceTitle; // 开票名称
|
||||
@ApiModelProperty("税号")
|
||||
private String taxpayerNo; // 税号
|
||||
@ApiModelProperty("发票代码")
|
||||
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; // 邮箱
|
||||
}
|
||||
@@ -0,0 +1,102 @@
|
||||
/*********************************************************
|
||||
*********************************************************
|
||||
******************** *******************
|
||||
************* ************
|
||||
******* _oo0oo_ *******
|
||||
*** o8888888o ***
|
||||
* 88" . "88 *
|
||||
* (| -_- |) *
|
||||
* 0\ = /0 *
|
||||
* ___/`---'\___ *
|
||||
* .' \\| |// '. *
|
||||
* / \\||| : |||// \ *
|
||||
* / _||||| -:- |||||- \ *
|
||||
* | | \\\ - /// | | *
|
||||
* | \_| ''\---/'' |_/ | *
|
||||
* \ .-\__ '-' ___/-. / *
|
||||
* ___'. .' /--.--\ `. .'___ *
|
||||
* ."" '< `.___\_<|>_/___.' >' "". *
|
||||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
|
||||
* \ \ `_. \_ __\ /__ _/ .-` / / *
|
||||
* =====`-.____`.___ \_____/___.-`___.-'===== *
|
||||
* `=---=' *
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
|
||||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
|
||||
*********************************************************/
|
||||
package com.yxt.ordermall.feign.sales.smssalesbill;
|
||||
|
||||
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) <br/>
|
||||
* File: SmsSalesBillLogistics.java <br/>
|
||||
* Class: com.yxt.sales.apiadmin.api.smssalesbilllogistics.SmsSalesBillLogistics <br/>
|
||||
* Description: 销售订单-物流信息. <br/>
|
||||
* Copyright: Copyright (c) 2011 <br/>
|
||||
* Company: https://gitee.com/liuzp315 <br/>
|
||||
* Makedate: 2024-07-04 15:18:10 <br/>
|
||||
*
|
||||
* @author liupopo
|
||||
* @version 1.0
|
||||
* @since 1.0
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "销售订单-物流信息", description = "销售订单-物流信息")
|
||||
@TableName("sms_sales_bill_logistics")
|
||||
public class SmsSalesBillLogistics extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("销售单sid")
|
||||
private String billSid; // 销售单sid
|
||||
@ApiModelProperty("物流公司sid")
|
||||
private String logisticsNameSid; // 物流公司
|
||||
@ApiModelProperty("物流公司")
|
||||
private String logisticsName; // 物流公司
|
||||
@ApiModelProperty("物流单号")
|
||||
private String logisticsNum; // 物流单号
|
||||
@ApiModelProperty("配送方式Key")
|
||||
private String deliveryTypeKey; // 配送方式Key
|
||||
@ApiModelProperty("配送方式Value")
|
||||
private String deliveryTypeValue; // 配送方式Value
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
||||
@ApiModelProperty("预计发货时间")
|
||||
private Date expectSendDate; // 预计发货时间
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
||||
@ApiModelProperty("发货日期")
|
||||
private Date sendDate; // 发货日期
|
||||
@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; // 应推时间
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
/*********************************************************
|
||||
*********************************************************
|
||||
******************** *******************
|
||||
************* ************
|
||||
******* _oo0oo_ *******
|
||||
*** o8888888o ***
|
||||
* 88" . "88 *
|
||||
* (| -_- |) *
|
||||
* 0\ = /0 *
|
||||
* ___/`---'\___ *
|
||||
* .' \\| |// '. *
|
||||
* / \\||| : |||// \ *
|
||||
* / _||||| -:- |||||- \ *
|
||||
* | | \\\ - /// | | *
|
||||
* | \_| ''\---/'' |_/ | *
|
||||
* \ .-\__ '-' ___/-. / *
|
||||
* ___'. .' /--.--\ `. .'___ *
|
||||
* ."" '< `.___\_<|>_/___.' >' "". *
|
||||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
|
||||
* \ \ `_. \_ __\ /__ _/ .-` / / *
|
||||
* =====`-.____`.___ \_____/___.-`___.-'===== *
|
||||
* `=---=' *
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
|
||||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
|
||||
*********************************************************/
|
||||
package com.yxt.ordermall.feign.sales.smssalesbill;
|
||||
|
||||
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,86 @@
|
||||
/*********************************************************
|
||||
*********************************************************
|
||||
******************** *******************
|
||||
************* ************
|
||||
******* _oo0oo_ *******
|
||||
*** o8888888o ***
|
||||
* 88" . "88 *
|
||||
* (| -_- |) *
|
||||
* 0\ = /0 *
|
||||
* ___/`---'\___ *
|
||||
* .' \\| |// '. *
|
||||
* / \\||| : |||// \ *
|
||||
* / _||||| -:- |||||- \ *
|
||||
* | | \\\ - /// | | *
|
||||
* | \_| ''\---/'' |_/ | *
|
||||
* \ .-\__ '-' ___/-. / *
|
||||
* ___'. .' /--.--\ `. .'___ *
|
||||
* ."" '< `.___\_<|>_/___.' >' "". *
|
||||
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
|
||||
* \ \ `_. \_ __\ /__ _/ .-` / / *
|
||||
* =====`-.____`.___ \_____/___.-`___.-'===== *
|
||||
* `=---=' *
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
|
||||
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
|
||||
*********************************************************/
|
||||
package com.yxt.ordermall.feign.sales.smssalesbill;
|
||||
|
||||
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: ss-sales(ss-sales) <br/>
|
||||
* File: SmsSalesBillshipper.java <br/>
|
||||
* Class: com.yxt.sales.apiadmin.api.smssalesbillshipper.SmsSalesBillshipper <br/>
|
||||
* Description: 销售订单-收货人信息. <br/>
|
||||
* Copyright: Copyright (c) 2011 <br/>
|
||||
* Company: https://gitee.com/liuzp315 <br/>
|
||||
* Makedate: 2024-07-04 15:18:10 <br/>
|
||||
*
|
||||
* @author liupopo
|
||||
* @version 1.0
|
||||
* @since 1.0
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "销售订单-收货人信息", description = "销售订单-收货人信息")
|
||||
@TableName("sms_sales_billshipper")
|
||||
public class SmsSalesBillshipper extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("销售单sid")
|
||||
private String billSid; // 销售单sid
|
||||
@ApiModelProperty("收货人姓名")
|
||||
private String shipperName; // 收货人姓名
|
||||
@ApiModelProperty("收货人手机")
|
||||
private String shipperMob; // 收货人手机
|
||||
@ApiModelProperty("收货省sid")
|
||||
private String deliveryProvinceSid; // 收货省sid
|
||||
@ApiModelProperty("收货省")
|
||||
private String deliveryProvince; // 收货省
|
||||
@ApiModelProperty("收货市sid")
|
||||
private String deliveryCitySid; // 收货市sid
|
||||
@ApiModelProperty("收货市")
|
||||
private String deliveryCity; // 收货市
|
||||
@ApiModelProperty("收货县区sid")
|
||||
private String deliveryCountySid; // 收货县区sid
|
||||
@ApiModelProperty("收货县区")
|
||||
private String deliveryCounty; // 收货县区
|
||||
@ApiModelProperty("收货详细地址")
|
||||
private String deliveryAddress; // 收货详细地址
|
||||
@ApiModelProperty("邮编 ")
|
||||
private String postCode; // 邮编
|
||||
@ApiModelProperty("店铺名称")
|
||||
private String shopName; // 店铺名称
|
||||
@ApiModelProperty("买家留言")
|
||||
private String buyerMessage; // 买家留言
|
||||
@ApiModelProperty("真实姓名")
|
||||
private String name; // 真实姓名
|
||||
@ApiModelProperty("身份证号码")
|
||||
private String idNo; // 身份证号码
|
||||
@ApiModelProperty("固定电话")
|
||||
private String phone; // 固定电话
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user