Skip to content

R
rs-cloud-platform
Commit 586e3da3 authored by unset's avatar unset
Browse files
Options

完善接口信息

parent a0e858e6
Hide whitespace changes
Inline Side-by-side
Showing with 1791 additions and 10 deletions
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/CartOrderDto.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.dto;
/**
* @ClassName : CartOrderDto
* @Description : 购物车订单参数
* @Author : jiaoruizhen
* @Date: 2020-12-04 11:02
*/
public class CartOrderDto {
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/CommonInfoDto.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.dto;
import com.github.wxiaoqi.security.common.vo.PageParam;
import lombok.Data;
/**
* @ClassName : CommonInfoDto
* @Description : 通用信息
* @Author : jiaoruizhen
* @Date: 2020-12-04 16:20
*/
@Data
public class CommonInfoDto extends PageParam {
Integer type;
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/ImageInfoRelationDto.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.dto;
import com.github.wxiaoqi.security.common.vo.PageParam;
import lombok.Data;
/**
* @ClassName : ImageInfoRelationDto
* @Description : 图像信息
* @Author : jiaoruizhen
* @Date: 2020-12-04 15:11
*/
@Data
public class ImageInfoRelationDto extends PageParam {
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/ImageInformationDto.java
View file @ 586e3da3
......@@ -14,4 +14,5 @@ public class ImageInformationDto extends PageParam {
String name;
Integer status;
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/ImageInformationStorageDto.java
View file @ 586e3da3
......@@ -11,4 +11,7 @@ import lombok.Data;
*/
@Data
public class ImageInformationStorageDto extends PageParam {
Integer status;
Integer type;
String name;
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/UserInvoiceDto.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.dto;
import com.github.wxiaoqi.security.common.vo.PageParam;
import lombok.Data;
/**
* @ClassName : UserInvoiceDto
* @Description : 用户发票管理
* @Author : jiaoruizhen
* @Date: 2020-12-04 10:10
*/
@Data
public class UserInvoiceDto extends PageParam {
Integer userId;
Integer titleType;
String titleName;
String taxCode;
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/UserOrderDto.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.dto;
import com.github.wxiaoqi.security.common.vo.PageParam;
import lombok.Data;
/**
* @ClassName : UserOrderDto
* @Description : 用户订单查询
* @Author : jiaoruizhen
* @Date: 2020-12-03 17:32
*/
@Data
public class UserOrderDto extends PageParam {
//订单状态：1--创建订单，2--待付款，3--已支付，4--已发货,5--已完成 -1、删除，-2、取消
Integer status;
//商品名称
String name;
//开始时间
String startTime;
//结束时间
String endTime;
//关键字
String keywords;
//支付状态: 1、已支付，2、未支付
Integer payStatus;
//用户id
Integer userId;
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/ImageImgStorage.java
View file @ 586e3da3
......@@ -2,6 +2,7 @@ package com.upyuns.platform.rs.website.entity;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -115,4 +116,9 @@ public class ImageImgStorage implements Serializable {
private Date crtTime;
private Date updTime;
//源图像信息
@Transient
List<ImageInfoRelation> imageInfoRelationList;
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/ImageInfoRelation.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.entity;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 影像图库上传图片关联信息
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-04 14:38:23
*/
@Data
@Table(name = "image_info_relation")
public class ImageInfoRelation implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty("")
private Integer id;
/**
* 图片链接
*/
@Column(name = "url")
@ApiModelProperty(value = "图片链接")
private String url;
/**
* 文件类型
*/
@Column(name = "file_type")
@ApiModelProperty(value = "文件类型")
private String fileType;
/**
* 文件大小
*/
@Column(name = "file_size")
@ApiModelProperty(value = "文件大小")
private String fileSize;
/**
* 文件尺寸
*/
@Column(name = "file_width")
@ApiModelProperty(value = "文件尺寸")
private String fileWidth;
/**
* 关联id
*/
@Column(name = "relation_id")
@ApiModelProperty(value = "关联id")
private Integer relationId;
/**
* 类型
*/
@Column(name = "type")
@ApiModelProperty(value = "类型")
private Integer type;
/**
*
*/
@Column(name = "crt_time")
@ApiModelProperty(value = "", hidden = true )
private Date crtTime;
/**
*
*/
@Column(name = "upd_time")
@ApiModelProperty(value = "", hidden = true )
private Date updTime;
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/NewsInfo.java
View file @ 586e3da3
......@@ -103,7 +103,11 @@ public class NewsInfo implements Serializable {
@Column(name = "index_show")
@ApiModelProperty(value = "是否首页展示：1、展示，2、不展示")
private Integer indexShow;
/**
* 是否是最热数据，1、是，2、不是
*/
private Integer isHot;
@Transient
String typeName;
......
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/OrderEInvoice.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 订单发票
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
@Data
@Table(name = "order_e_invoice")
public class OrderEInvoice implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty("主键")
private Integer id;
/**
* 发票类型：1--租房车；2--房车游；3--会员
*/
@Column(name = "type")
@ApiModelProperty(value = "发票类型：1--租房车；2--房车游；3--会员")
private Integer type;
/**
* 订单ids，逗号分隔
*/
@Column(name = "order_ids")
@ApiModelProperty(value = "订单ids，逗号分隔")
private String orderIds;
/**
* 发票抬头类型：1--企业单位；2--个人/非企业单位
*/
@Column(name = "title_type")
@ApiModelProperty(value = "发票抬头类型：1--企业单位；2--个人/非企业单位")
private Integer titleType;
/**
* 抬头名称
*/
@Column(name = "title_name")
@ApiModelProperty(value = "抬头名称")
private String titleName;
/**
* 税号
*/
@Column(name = "tax_code")
@ApiModelProperty(value = "税号")
private String taxCode;
/**
* 发票内容-备注说明
*/
@Column(name = "content_remark")
@ApiModelProperty(value = "发票内容-备注说明")
private String contentRemark;
/**
* 发票内容-地址和电话
*/
@Column(name = "content_contact")
@ApiModelProperty(value = "发票内容-地址和电话")
private String contentContact;
/**
* 发票内容-开户行和账号
*/
@Column(name = "content_account")
@ApiModelProperty(value = "发票内容-开户行和账号")
private String contentAccount;
/**
* 发票方
*/
@Column(name = "drawer")
@ApiModelProperty(value = "发票方")
private String drawer;
/**
* 更多内容
*/
@Column(name = "extend")
@ApiModelProperty(value = "更多内容")
private String extend;
/**
* 金额
*/
@Column(name = "amount")
@ApiModelProperty(value = "金额")
private BigDecimal amount;
/**
* 接收方式：1--邮件
*/
@Column(name = "receive_type")
@ApiModelProperty(value = "接收方式：1--邮件")
private Integer receiveType;
/**
* 接收方式内容
*/
@Column(name = "receive_content")
@ApiModelProperty(value = "接收方式内容")
private String receiveContent;
/**
* 创建时间
*/
@Column(name = "crt_time")
@ApiModelProperty(value = "创建时间", hidden = true )
private Long crtTime;
/**
* 更新时间
*/
@Column(name = "upd_time")
@ApiModelProperty(value = "更新时间", hidden = true )
private Long updTime;
/**
* 创建者id
*/
@Column(name = "user_id")
@ApiModelProperty(value = "创建者id")
private Integer userId;
/**
* 更新者id
*/
@Column(name = "user_upd")
@ApiModelProperty(value = "更新者id")
private Integer userUpd;
/**
*
*/
@Column(name = "invoice_url")
@ApiModelProperty(value = "")
private String invoiceUrl;
/**
* 开票状态 0:未开票;1:开票中;2:为开票成功;3:开票失败;
*/
@Column(name = "status")
@ApiModelProperty(value = "开票状态 0:未开票;1:开票中;2:为开票成功;3:开票失败;")
private Integer status;
/**
* 发票内容
*/
@Column(name = "content_title")
@ApiModelProperty(value = "发票内容")
private String contentTitle;
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/OrderInfo.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 订单信息
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
@Data
@Table(name = "order_info")
public class OrderInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty("")
private Long orderId;
/**
* 订单号
*/
@Column(name = "order_no")
@ApiModelProperty(value = "订单号")
private String orderNo;
/**
* 单价
*/
@Column(name = "amount")
@ApiModelProperty(value = "单价")
private BigDecimal amount;
/**
* 数量
*/
@Column(name = "number")
@ApiModelProperty(value = "数量")
private Integer number;
/**
* 订单状态：1--创建订单，2--待付款，3--已支付，4--已发货,5--已完成 -1、删除，-2、取消
*/
@Column(name = "status")
@ApiModelProperty(value = " 订单状态：1--创建订单，2--待付款，3--已支付，4--已发货,5--已完成 -1、删除，-2、取消")
private Integer status;
/**
* 支付状态：1--未支付，2--已支付
*/
private Integer payStatus;
/**
* 用户id
*/
@Column(name = "user_id")
@ApiModelProperty(value = "用户id")
private Integer userId;
/**
* 用户手机号
*/
@Column(name = "phone")
@ApiModelProperty(value = "用户手机号")
private String phone;
/**
* 用户昵称
*/
@Column(name = "nickname")
@ApiModelProperty(value = "用户昵称")
private String nickname;
/**
* 用户真实姓名
*/
@Column(name = "real_name")
@ApiModelProperty(value = "用户真实姓名")
private String realName;
/**
* 头像
*/
@Column(name = "head_img")
@ApiModelProperty(value = "头像")
private String headImg;
/**
* 1、微信支付，2、支付宝支付，3、对公支付
*/
@Column(name = "pay_type")
@ApiModelProperty(value = "1、微信支付，2、支付宝支付，3、对公支付")
private Integer payType;
/**
* 下单时间
*/
@Column(name = "crt_time")
@ApiModelProperty(value = "下单时间", hidden = true )
private Date crtTime;
/**
* 支付时间
*/
@Column(name = "pay_time")
@ApiModelProperty(value = "支付时间")
private Date payTime;
/**
*
*/
@Column(name = "upd_time")
@ApiModelProperty(value = "", hidden = true )
private Date updTime;
/**
* 运费
*/
@Column(name = "fee")
@ApiModelProperty(value = "运费")
private BigDecimal fee;
/**
* 订单备注
*/
@Column(name = "remark")
@ApiModelProperty(value = "订单备注")
private String remark;
/**
* 配送方式:1、线上配送，2、快递配送
*/
@Column(name = "send_type")
@ApiModelProperty(value = "配送方式:1、线上配送，2、快递配送")
private Integer sendType;
/**
* 收货人姓名
*/
@Column(name = "receive_name")
@ApiModelProperty(value = "收货人姓名")
private String receiveName;
/**
* 收货人电话
*/
@Column(name = "receive_phone")
@ApiModelProperty(value = "收货人电话")
private String receivePhone;
/**
* 收货地址
*/
@Column(name = "receive_address")
@ApiModelProperty(value = "收货地址")
private String receiveAddress;
/**
*
*/
@Column(name = "total_amount")
@ApiModelProperty(value = "")
private BigDecimal totalAmount;
/**
*
*/
@Column(name = "type")
@ApiModelProperty(value = "")
private Integer type;
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/OrderItem.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 订单商品信息
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
@Data
@Table(name = "order_item")
public class OrderItem implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty("")
private Long itemId;
/**
* 订单ID
*/
@Column(name = "order_id")
@ApiModelProperty(value = "订单ID")
private Long orderId;
/**
* 商品名称
*/
@Column(name = "name")
@ApiModelProperty(value = "商品名称")
private String name;
/**
* 详情id
*/
@Column(name = "detail_id")
@ApiModelProperty(value = "详情id")
private Integer detailId;
/**
* 详情json信息
*/
@Column(name = "detail_json")
@ApiModelProperty(value = "详情json信息")
private String detailJson;
/**
* 单价
*/
@Column(name = "price")
@ApiModelProperty(value = "单价")
private BigDecimal price;
/**
* 数量
*/
@Column(name = "number")
@ApiModelProperty(value = "数量")
private Integer number;
/**
* 订单图片
*/
@Column(name = "item_pic")
@ApiModelProperty(value = "订单图片")
private String itemPic;
/**
* 下单时间
*/
@Column(name = "crt_time")
@ApiModelProperty(value = "下单时间", hidden = true )
private Date crtTime;
/**
*
*/
@Column(name = "upd_time")
@ApiModelProperty(value = "", hidden = true )
private Date updTime;
/**
* 1、标准数据，2、影像图库，3、行业应用信息
*/
@Column(name = "type")
@ApiModelProperty(value = "1、标准数据，2、影像图库，3、行业应用信息")
private Integer type;
/**
* 文件路径
*/
@Column(name = "file_path")
@ApiModelProperty(value = "文件路径")
private String filePath;
/**
*
*/
@Column(name = "total_amount")
@ApiModelProperty(value = "")
private BigDecimal totalAmount;
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/ShoppingCartInfo.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 购物车
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
@Data
@Table(name = "shopping_cart_info")
public class ShoppingCartInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty("")
private Long cartId;
/**
* 订单名称
*/
@Column(name = "name")
@ApiModelProperty(value = "订单名称")
private String name;
/**
* 详情id
*/
@Column(name = "detail_id")
@ApiModelProperty(value = "详情id")
private Integer detailId;
/**
* 详情json信息
*/
@Column(name = "detail_json")
@ApiModelProperty(value = "详情json信息")
private String detailJson;
/**
* 单价
*/
@Column(name = "price")
@ApiModelProperty(value = "单价")
private BigDecimal price;
/**
* 数量
*/
@Column(name = "number")
@ApiModelProperty(value = "数量")
private Integer number;
/**
* 订单图片
*/
@Column(name = "item_pic")
@ApiModelProperty(value = "订单图片")
private String itemPic;
/**
* 用户id
*/
@Column(name = "user_id")
@ApiModelProperty(value = "用户id")
private Integer userId;
/**
* 用户手机号
*/
@Column(name = "phone")
@ApiModelProperty(value = "用户手机号")
private String phone;
/**
* 用户昵称
*/
@Column(name = "nickname")
@ApiModelProperty(value = "用户昵称")
private String nickname;
/**
* 用户真实姓名
*/
@Column(name = "real_name")
@ApiModelProperty(value = "用户真实姓名")
private String realName;
/**
* 头像
*/
@Column(name = "head_img")
@ApiModelProperty(value = "头像")
private String headImg;
/**
* 下单时间
*/
@Column(name = "crt_time")
@ApiModelProperty(value = "下单时间", hidden = true )
private Date crtTime;
/**
*
*/
@Column(name = "upd_time")
@ApiModelProperty(value = "", hidden = true )
private Date updTime;
/**
* 1、标准数据，2、影像图库，3、行业应用信息
*/
@Column(name = "type")
@ApiModelProperty(value = "1、标准数据，2、影像图库，3、行业应用信息")
private Integer type;
/**
* 是否删除: 0、否，1、是
*/
@Column(name = "is_del")
@ApiModelProperty(value = "是否删除: 0、否，1、是")
private Integer isDel;
/**
* 文件路径
*/
@Column(name = "file_path")
@ApiModelProperty(value = "文件路径")
private String filePath;
/**
*
*/
@Column(name = "total_amount")
@ApiModelProperty(value = "")
private BigDecimal totalAmount;
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/UserInvoice.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.entity;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 用户发票信息
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
@Data
@Table(name = "user_invoice")
public class UserInvoice implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty("")
private Integer id;
/**
* 用户id
*/
@Column(name = "user_id")
@ApiModelProperty(value = "用户id")
private Integer userId;
/**
* 发票抬头类型：1--企业单位；2--个人/非企业单位
*/
@Column(name = "title_type")
@ApiModelProperty(value = "发票抬头类型：1--企业单位；2--个人/非企业单位")
private Integer titleType;
/**
* 抬头名称
*/
@Column(name = "title_name")
@ApiModelProperty(value = "抬头名称")
private String titleName;
/**
* 税号
*/
@Column(name = "tax_code")
@ApiModelProperty(value = "税号")
private String taxCode;
/**
* 发票内容-备注说明
*/
@Column(name = "content_remark")
@ApiModelProperty(value = "发票内容-备注说明")
private String contentRemark;
/**
* 收票地址
*/
@Column(name = "address")
@ApiModelProperty(value = "收票地址")
private String address;
/**
* 收票电话
*/
@Column(name = "phone")
@ApiModelProperty(value = "收票电话")
private String phone;
/**
* 账号
*/
@Column(name = "account")
@ApiModelProperty(value = "账号")
private String account;
/**
* 开户行
*/
@Column(name = "open_bank")
@ApiModelProperty(value = "开户行")
private String openBank;
/**
*
*/
@Column(name = "crt_time")
@ApiModelProperty(value = "", hidden = true )
private Date crtTime;
/**
*
*/
@Column(name = "upd_time")
@ApiModelProperty(value = "", hidden = true )
private Date updTime;
/**
* 营业执照地址
*/
@Column(name = "file_path")
@ApiModelProperty(value = "营业执照地址")
private String filePath;
private Integer isDel;
}
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/CommonInfoBiz.java
View file @ 586e3da3
......@@ -3,7 +3,10 @@ package com.upyuns.platform.rs.website.biz;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.Query;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.upyuns.platform.rs.website.dto.CommonInfoDto;
import org.springframework.stereotype.Service;
import com.upyuns.platform.rs.website.entity.CommonInfo;
......@@ -23,6 +26,11 @@ import java.util.List;
@Service
public class CommonInfoBiz extends BaseBiz<CommonInfoMapper,CommonInfo> {
/**
* 新增通用信息
* @param commonInfo
* @return
*/
public ObjectRestResponse addUpdate(CommonInfo commonInfo) {
if (commonInfo == null) {
return ObjectRestResponse.paramIsEmpty();
......@@ -51,4 +59,16 @@ public class CommonInfoBiz extends BaseBiz<CommonInfoMapper,CommonInfo> {
return mapper.selectByExample(example);
}
public ObjectRestResponse getAll(CommonInfoDto commonInfoDto) {
Example example = new Example(CommonInfo.class);
Example.Criteria criteria = example.createCriteria();
criteria.andEqualTo("isDel", 0);
if (commonInfoDto.getType() != null) {
criteria.andEqualTo("type", commonInfoDto.getType());
}
Query query = new Query(commonInfoDto);
PageDataVO<CommonInfo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
return ObjectRestResponse.succ(pageDataVO);
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ImageImgStorageBiz.java
View file @ 586e3da3
......@@ -6,9 +6,10 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.Query;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.upyuns.platform.rs.website.dto.ImageInformationDto;
import com.upyuns.platform.rs.website.dto.ImageInformationStorageDto;
import com.upyuns.platform.rs.website.entity.ImageInformation;
import com.upyuns.platform.rs.website.entity.ImageInfoRelation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.upyuns.platform.rs.website.entity.ImageImgStorage;
......@@ -16,6 +17,8 @@ import com.upyuns.platform.rs.website.mapper.ImageImgStorageMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import tk.mybatis.mapper.entity.Example;
import java.util.List;
/**
* 影像图库
*
......@@ -26,6 +29,8 @@ import tk.mybatis.mapper.entity.Example;
@Service
public class ImageImgStorageBiz extends BaseBiz<ImageImgStorageMapper,ImageImgStorage> {
@Autowired
ImageInfoRelationBiz imageInfoRelationBiz;
/**
* 新增或者编辑图像库信息
......@@ -38,6 +43,14 @@ public class ImageImgStorageBiz extends BaseBiz<ImageImgStorageMapper,ImageImgSt
}
if (imageImgStorage.getId() == null) {
insertSelectiveRe(imageImgStorage);
if (imageImgStorage.getImageInfoRelationList() != null && imageImgStorage.getImageInfoRelationList().size() > 0) {
imageImgStorage.getImageInfoRelationList().parallelStream().forEach(imageInfoRelation -> {
imageInfoRelation.setType(1);
imageInfoRelation.setRelationId(imageImgStorage.getId());
imageInfoRelationBiz.insertSelectiveRe(imageInfoRelation);
});
}
} else {
ImageImgStorage old = selectById(imageImgStorage.getId());
if (old == null) {
......@@ -46,6 +59,14 @@ public class ImageImgStorageBiz extends BaseBiz<ImageImgStorageMapper,ImageImgSt
BeanUtil.copyProperties(imageImgStorage, old, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
updateSelectiveByIdRe(old);
}
if (old.getImageInfoRelationList() != null && old.getImageInfoRelationList().size() > 0) {
old.getImageInfoRelationList().parallelStream().forEach(imageInfoRelation -> {
imageInfoRelation.setType(1);
imageInfoRelation.setRelationId(old.getId());
imageInfoRelationBiz.insertSelectiveRe(imageInfoRelation);
});
}
}
return ObjectRestResponse.succ();
}
......@@ -59,9 +80,46 @@ public class ImageImgStorageBiz extends BaseBiz<ImageImgStorageMapper,ImageImgSt
Example example = new Example(ImageImgStorage.class);
Example.Criteria criteria = example.createCriteria();
criteria.andEqualTo("isDel", 0);
if (imageInformationStorageDto.getStatus() != null) {
criteria.andEqualTo("status", imageInformationStorageDto.getStatus());
}
if (imageInformationStorageDto.getType() != null) {
criteria.andEqualTo("type", imageInformationStorageDto.getType());
}
if (StringUtils.isNotBlank(imageInformationStorageDto.getName())) {
criteria.andLike("name", "%" + imageInformationStorageDto.getName() + "%");
}
example.orderBy("updTime").desc();
Query query = new Query(imageInformationStorageDto);
PageDataVO<ImageImgStorage> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
if (pageDataVO != null && pageDataVO.getData() != null) {
pageDataVO.getData().parallelStream().forEach(imageImgStorage -> {
List<ImageInfoRelation> imageInfoRelationList = imageInfoRelationBiz.getAllImageRelation(imageImgStorage.getId(), 1);
if (imageInfoRelationList != null) {
imageImgStorage.setImageInfoRelationList(imageInfoRelationList);
}
});
}
return ObjectRestResponse.succ(pageDataVO);
}
/**
* 查询详情信息
* @param id
* @return
*/
public ObjectRestResponse getDetail(Integer id) {
if (id == null) {
return ObjectRestResponse.paramIsEmpty();
}
ImageImgStorage imageImgStorage = selectById(id);
if (imageImgStorage == null) {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
}
List<ImageInfoRelation> imageInfoRelationList = imageInfoRelationBiz.getAllImageRelation(imageImgStorage.getId(), 1);
if (imageInfoRelationList != null) {
imageImgStorage.setImageInfoRelationList(imageInfoRelationList);
}
return ObjectRestResponse.succ(imageInfoRelationList);
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ImageInfoRelationBiz.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.biz;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.Query;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.upyuns.platform.rs.website.dto.ImageInfoRelationDto;
import org.springframework.stereotype.Service;
import com.upyuns.platform.rs.website.entity.ImageInfoRelation;
import com.upyuns.platform.rs.website.mapper.ImageInfoRelationMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import tk.mybatis.mapper.entity.Example;
import java.util.ArrayList;
import java.util.List;
/**
* 影像图库上传图片关联信息
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-04 14:38:23
*/
@Service
public class ImageInfoRelationBiz extends BaseBiz<ImageInfoRelationMapper,ImageInfoRelation> {
/**
* 查询影像图框图片类型
* @param relationId
* @param type
* @return
*/
public List<ImageInfoRelation> getAllImageRelation(Integer relationId, Integer type) {
Example example = new Example(ImageInfoRelation.class);
example.createCriteria().andEqualTo("relationId", relationId).andEqualTo("type", type);
List<ImageInfoRelation> list = mapper.selectByExample(example);
if (list != null && list.size() > 0) {
list.parallelStream().forEach(imageInfoRelation -> {
imageInfoRelation.setUrl(null);
});
return list;
}
return new ArrayList<>();
}
/**
* 根据影像尺寸查询对应图像信息
* @param relationId
* @param type
* @param fileWidth
* @return
*/
public ImageInfoRelation getOneByWidth(Integer relationId, Integer type, String fileWidth) {
Example example = new Example(ImageInfoRelation.class);
example.createCriteria().andEqualTo("relationId", relationId).andEqualTo("type", type).andEqualTo("fileWidth", fileWidth);
return mapper.selectOneByExample(example);
}
/**
* 查询所有影像图片信息
* @return
*/
public ObjectRestResponse getAll(ImageInfoRelationDto imageInfoRelationDto) {
Example example = new Example(ImageInfoRelation.class);
Query query = new Query(imageInfoRelationDto);
example.orderBy("updTime").desc();
PageDataVO<ImageInfoRelation> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
return ObjectRestResponse.succ(pageDataVO);
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ImageInformationBiz.java
View file @ 586e3da3
......@@ -25,10 +25,11 @@ import java.util.List;
* @date 2020-11-28 14:15:32
*/
@Service
public class ImageInformationBiz extends BaseBiz<ImageInformationMapper,ImageInformation> {
public class ImageInformationBiz extends BaseBiz<ImageInformationMapper, ImageInformation> {
/**
* 新增或者编辑图像信息
*
* @param imageInformation
* @return
*/
......@@ -52,6 +53,7 @@ public class ImageInformationBiz extends BaseBiz<ImageInformationMapper,ImageInf
/**
* 分页查询图像信息
*
* @param imageInformationDto
* @return
*/
......@@ -62,7 +64,10 @@ public class ImageInformationBiz extends BaseBiz<ImageInformationMapper,ImageInf
if (StringUtils.isNotBlank(imageInformationDto.getName())) {
criteria.andLike("name", "%" + imageInformationDto.getName() + "%");
}
example.orderBy("updTime");
if (imageInformationDto.getStatus() != null) {
criteria.andEqualTo("status", imageInformationDto.getStatus());
}
example.orderBy("updTime").desc();
Query query = new Query(imageInformationDto);
PageDataVO<ImageInformation> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
return ObjectRestResponse.succ(pageDataVO);
......@@ -70,6 +75,7 @@ public class ImageInformationBiz extends BaseBiz<ImageInformationMapper,ImageInf
/**
* 获取所有影像信息
*
* @return
*/
public List<ImageInformation> getAll() {
......
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/IndustryApplicationInfoBiz.java
View file @ 586e3da3
......@@ -93,7 +93,7 @@ public class IndustryApplicationInfoBiz extends BaseBiz<IndustryApplicationInfoM
Map<Integer, List<IndustryApplicationType>> map = industryApplicationTypeList.stream().collect(Collectors.groupingBy(IndustryApplicationType::getId));
Example example = new Example(IndustryApplicationInfo.class);
example.createCriteria().andEqualTo("isDel", 0).andEqualTo("status", 1).andEqualTo("indexShow", 1).andIn("firstTypeId", map.keySet());
example.orderBy("rank");
example.orderBy("updTime").desc();
List<IndustryApplicationInfo> industryApplicationInfoList = mapper.selectByExample(example);
if (industryApplicationInfoList != null && industryApplicationInfoList.size() > 0) {
industryApplicationInfoList.parallelStream().forEach(industryApplicationInfo -> {
......
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/NewsInfoBiz.java
View file @ 586e3da3
......@@ -119,4 +119,20 @@ public class NewsInfoBiz extends BaseBiz<NewsInfoMapper, NewsInfo> {
return ObjectRestResponse.succ(pageDataVO);
}
/**
* 获取最新推荐的一条数据
* @return
*/
public ObjectRestResponse getHotMsg() {
Example example = new Example(NewsInfo.class);
example.createCriteria().andEqualTo("isDel", 0).andEqualTo("status", 1).andEqualTo("isHot", 1);
example.orderBy("updTime").desc();
List<NewsInfo> list = mapper.selectByExample(example);
if (list != null && list.size() > 0) {
return ObjectRestResponse.succ(list.get(0));
}
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderEInvoiceBiz.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.biz;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import org.springframework.stereotype.Service;
import com.upyuns.platform.rs.website.entity.OrderEInvoice;
import com.upyuns.platform.rs.website.mapper.OrderEInvoiceMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import tk.mybatis.mapper.entity.Example;
import java.util.List;
/**
* 订单发票
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
@Service
public class OrderEInvoiceBiz extends BaseBiz<OrderEInvoiceMapper, OrderEInvoice> {
/**
* 添加订单发票
* @param orderEInvoice
* @return
*/
public ObjectRestResponse addUpdate(OrderEInvoice orderEInvoice) {
if (orderEInvoice == null) {
return ObjectRestResponse.paramIsEmpty();
}
if (orderEInvoice.getId() == null) {
insertSelectiveRe(orderEInvoice);
} else {
OrderEInvoice old = selectById(orderEInvoice.getId());
BeanUtil.copyProperties(orderEInvoice, old, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
updateSelectiveByIdRe(old);
}
return ObjectRestResponse.succ();
}
/**
* 查询用户所有订单发票
* @param userId
* @return
*/
public List<OrderEInvoice> getUserInvoice(Integer userId) {
Example example = new Example(OrderEInvoice.class);
example.createCriteria().andEqualTo("userId", userId);
return mapper.selectByExample(example);
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.biz;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.OrderUtil;
import com.upyuns.platform.rs.website.dto.UserOrderDto;
import com.upyuns.platform.rs.website.entity.OrderItem;
import com.upyuns.platform.rs.website.entity.ShoppingCartInfo;
import com.upyuns.platform.rs.website.mapper.OrderItemMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.upyuns.platform.rs.website.entity.OrderInfo;
import com.upyuns.platform.rs.website.mapper.OrderInfoMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import tk.mybatis.mapper.entity.Example;
import java.util.ArrayList;
import java.util.List;
/**
* 订单信息
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
@Service
public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
@Autowired
OrderItemMapper orderItemMapper;
/**
* 添加订单
* @param orderInfo
* @return
*/
public ObjectRestResponse addUpdate(OrderInfo orderInfo) {
if (orderInfo == null) {
return ObjectRestResponse.paramIsEmpty();
}
if (orderInfo.getOrderId() == null) {
insertSelectiveRe(orderInfo);
} else {
OrderInfo old = selectById(orderInfo.getOrderId());
BeanUtil.copyProperties(orderInfo, old, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
updateSelectiveByIdRe(old);
}
return ObjectRestResponse.succ();
}
/**
* 下单
* @param orderInfo
* @return
*/
public ObjectRestResponse generateOrder(OrderInfo orderInfo) {
if (orderInfo == null) {
return ObjectRestResponse.paramIsEmpty();
}
if (StringUtils.isNotBlank(orderInfo.getOrderNo())) {
orderInfo.setOrderNo(OrderUtil.GetOrderNumber("", OrderUtil.APP_MID));
}
OrderInfo old = getOneByOrderNo(orderInfo.getOrderNo());
while (old != null) {
orderInfo.setOrderNo(OrderUtil.GetOrderNumber("", OrderUtil.APP_MID));
old = getOneByOrderNo(orderInfo.getOrderNo());
}
return addUpdate(orderInfo);
}
/**
* 根据订单号查询订单信息
* @param orderNo
* @return
*/
public OrderInfo getOneByOrderNo(String orderNo) {
Example example = new Example(OrderInfo.class);
example.createCriteria().andEqualTo("orderNo", orderNo).andNotEqualTo("status", -1).andEqualTo("status", -2);
return mapper.selectOneByExample(example);
}
/**
* 查询用户所有订单
* @param userOrderDto
* @return
*/
public List<OrderInfo> getUserOrder(UserOrderDto userOrderDto) {
Example example = new Example(OrderInfo.class);
Example orderItemExample = new Example(OrderItem.class);
Example.Criteria orderInfoCriteria = example.createCriteria();
Example.Criteria orderItemCriteria = orderItemExample.createCriteria();
if (userOrderDto.getStatus() != null) {
orderInfoCriteria.andEqualTo("status", userOrderDto.getStatus());
}
if (userOrderDto.getPayStatus() != null) {
orderInfoCriteria.andEqualTo("payStatus", userOrderDto.getPayStatus());
}
if (userOrderDto.getUserId() != null) {
orderInfoCriteria.andEqualTo("userId", userOrderDto.getUserId());
}
if (StringUtils.isNotBlank(userOrderDto.getName())) {
orderItemCriteria.andLike("name", "%"+ userOrderDto.getName() +"%");
}
orderInfoCriteria.andNotEqualTo("status", -1);
example.orderBy("updTime").desc();
List<OrderInfo> orderInfoList = mapper.selectByExample(example);
if (orderInfoList != null) {
}
return new ArrayList<>();
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderItemBiz.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.biz;
import org.springframework.stereotype.Service;
import com.upyuns.platform.rs.website.entity.OrderItem;
import com.upyuns.platform.rs.website.mapper.OrderItemMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
/**
* 订单商品信息
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
@Service
public class OrderItemBiz extends BaseBiz<OrderItemMapper,OrderItem> {
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ShoppingCartInfoBiz.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.biz;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.upyuns.platform.rs.website.entity.OrderEInvoice;
import com.upyuns.platform.rs.website.entity.OrderInfo;
import com.upyuns.platform.rs.website.entity.OrderItem;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.upyuns.platform.rs.website.entity.ShoppingCartInfo;
import com.upyuns.platform.rs.website.mapper.ShoppingCartInfoMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import tk.mybatis.mapper.entity.Example;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* 购物车
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
@Service
public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper,ShoppingCartInfo> {
@Autowired
OrderInfoBiz orderInfoBiz;
@Autowired
OrderItemBiz orderItemBiz;
/**
* 添加购物车
* @param shoppingCartInfo
* @return
*/
public ObjectRestResponse addUpdate(ShoppingCartInfo shoppingCartInfo) {
if (shoppingCartInfo == null) {
return ObjectRestResponse.paramIsEmpty();
}
if (shoppingCartInfo.getCartId() == null) {
insertSelectiveRe(shoppingCartInfo);
} else {
ShoppingCartInfo old = selectById(shoppingCartInfo.getCartId());
BeanUtil.copyProperties(shoppingCartInfo, old, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
updateSelectiveByIdRe(old);
}
return ObjectRestResponse.succ();
}
/**
* 获取用户所有购物车商品
* @param userId
* @return
*/
public ObjectRestResponse getUserAllCart(Integer userId) {
Example example = new Example(ShoppingCartInfo.class);
example.createCriteria().andEqualTo("userId", userId).andEqualTo("isDel", 0);
example.orderBy("updTime").desc();
return ObjectRestResponse.succ(mapper.selectByExample(example));
}
/**
* 购物车转为订单
* @param ids
* @return
*/
public ObjectRestResponse convertShopCartToOrderInfo(String ids) {
if (StringUtils.isBlank(ids)) {
return ObjectRestResponse.paramIsEmpty();
}
String[] cartIds = ids.split(",");
if (cartIds == null || ids.length() <= 0) {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
}
Example example = new Example(ShoppingCartInfo.class);
example.createCriteria().andIn("cartId", Arrays.asList(cartIds)).andEqualTo("isDel", 0);
List<ShoppingCartInfo> cartInfoList = mapper.selectByExample(example);
if (cartInfoList != null && cartInfoList.size() > 0) {
convertToOrderInfo(cartInfoList);
return ObjectRestResponse.succ();
}
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
}
/**
* 购物车转订单实现
* @param cartInfoList
*/
private void convertToOrderInfo(List<ShoppingCartInfo> cartInfoList) {
List<OrderItem> orderItemList = new ArrayList<>();
//总金额
double amount = cartInfoList.parallelStream().mapToDouble(shoppingCartInfo ->shoppingCartInfo.getTotalAmount().doubleValue()).sum();
//总数量
Integer totalNumber = cartInfoList.parallelStream().mapToInt(ShoppingCartInfo::getNumber).sum();
OrderInfo orderInfo = new OrderInfo();
orderInfo.setAmount(new BigDecimal(amount).setScale(2, BigDecimal.ROUND_HALF_UP));
orderInfo.setNumber(totalNumber);
orderInfo.set
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/UserInvoiceBiz.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.biz;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.Query;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.upyuns.platform.rs.website.dto.UserInvoiceDto;
import com.upyuns.platform.rs.website.entity.OrderEInvoice;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.upyuns.platform.rs.website.entity.UserInvoice;
import com.upyuns.platform.rs.website.mapper.UserInvoiceMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import tk.mybatis.mapper.entity.Example;
/**
* 用户发票信息
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
@Service
public class UserInvoiceBiz extends BaseBiz<UserInvoiceMapper,UserInvoice> {
/**
* 添加用户发票
* @param userInvoice
* @return
*/
public ObjectRestResponse addUpdate(UserInvoice userInvoice) {
if (userInvoice == null) {
return ObjectRestResponse.paramIsEmpty();
}
if (userInvoice.getId() == null) {
UserInvoice old = getOneByTax(userInvoice.getTaxCode(), userInvoice.getUserId());
if (old != null) {
userInvoice.setId(old.getId());
updateData(userInvoice);
} else {
insertSelectiveRe(userInvoice);
}
} else {
updateData(userInvoice);
}
return ObjectRestResponse.succ();
}
/**
* 查询发票信息
* @param tax
* @param userId
* @return
*/
public UserInvoice getOneByTax(String tax, Integer userId) {
Example example = new Example(UserInvoice.class);
example.createCriteria().andEqualTo("taxCode", tax).andEqualTo("userId", userId).andEqualTo("isDel", 0);
return mapper.selectOneByExample(example);
}
/**
* 分页查询用户发票信息
* @param userInvoiceDto
* @return
*/
public ObjectRestResponse getList(UserInvoiceDto userInvoiceDto) {
Example example = new Example(UserInvoice.class);
Example.Criteria criteria = example.createCriteria();
if (userInvoiceDto.getUserId() != null) {
criteria.andEqualTo("userId", userInvoiceDto.getUserId());
}
if (userInvoiceDto.getTitleType() != null) {
criteria.andEqualTo("titleType", userInvoiceDto.getTitleType());
}
if (StringUtils.isNotBlank(userInvoiceDto.getTitleName())) {
criteria.andEqualTo("titleName", "%" + userInvoiceDto.getTitleName() + "%");
}
if (StringUtils.isNotBlank(userInvoiceDto.getTaxCode())) {
criteria.andEqualTo("taxCode", "%" + userInvoiceDto.getTaxCode() + "%");
}
criteria.andEqualTo("isDel", 0);
example.orderBy("updTime");
Query query = new Query(userInvoiceDto);
PageDataVO<UserInvoice> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
return ObjectRestResponse.succ(pageDataVO);
}
/**
* 查询用户所有发票信息
* @param userInvoiceDto
* @return
*/
public ObjectRestResponse getUserInvoiceInfo(UserInvoiceDto userInvoiceDto) {
return getList(userInvoiceDto);
}
/**
* 更新发票信息
* @param userInvoice
* @return
*/
public ObjectRestResponse updateData(UserInvoice userInvoice) {
UserInvoice old = selectById(userInvoice.getId());
BeanUtil.copyProperties(userInvoice, old, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
updateSelectiveByIdRe(old);
return ObjectRestResponse.succ();
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/CommonInfoController.java
View file @ 586e3da3
package com.upyuns.platform.rs.website.controller;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.upyuns.platform.rs.website.biz.CommonInfoBiz;
import com.upyuns.platform.rs.website.dto.CommonInfoDto;
import com.upyuns.platform.rs.website.entity.CommonInfo;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -10,4 +13,14 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("commonInfo")
public class CommonInfoController extends BaseController<CommonInfoBiz,CommonInfo> {
@GetMapping(value = "getByType")
public ObjectRestResponse getByType(Integer type) {
return ObjectRestResponse.succ(baseBiz.getByType(type));
}
@GetMapping(value = "getAll")
public ObjectRestResponse getAll(CommonInfoDto commonInfoDto) {
return baseBiz.getAll(commonInfoDto);
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/ImageImgStorageController.java
View file @ 586e3da3
......@@ -23,4 +23,8 @@ public class ImageImgStorageController extends BaseController<ImageImgStorageBiz
return baseBiz.addUpdate(imageImgStorage);
}
@GetMapping(value = "/getDetail/{id}")
public ObjectRestResponse getDetail(@PathVariable Integer id) {
return baseBiz.getDetail(id);
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/ImageInfoRelationController.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.controller;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.upyuns.platform.rs.website.biz.ImageInfoRelationBiz;
import com.upyuns.platform.rs.website.dto.ImageInfoRelationDto;
import com.upyuns.platform.rs.website.entity.ImageInfoRelation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("imageInfoRelation")
public class ImageInfoRelationController extends BaseController<ImageInfoRelationBiz,ImageInfoRelation> {
@GetMapping(value = "getAll")
public ObjectRestResponse getAll(ImageInfoRelationDto imageInfoRelationDto) {
return baseBiz.getAll(imageInfoRelationDto);
}
@GetMapping(value = "getAllImageRelation")
public ObjectRestResponse getAllImageRelation(Integer relationId, Integer type) {
return ObjectRestResponse.succ(baseBiz.getAllImageRelation(relationId, type));
}
@GetMapping(value = "getOneByWidth")
public ObjectRestResponse getOneByWidth(Integer relationId, Integer type, String fileWidth) {
return ObjectRestResponse.succ(baseBiz.getOneByWidth(relationId, type, fileWidth));
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/ImageInformationController.java
View file @ 586e3da3
......@@ -24,8 +24,8 @@ public class ImageInformationController extends BaseController<ImageInformationB
}
@GetMapping(value = "/app/unauth/getAll")
public ObjectRestResponse getAll() {
return ObjectRestResponse.succ(baseBiz.getAll());
public ObjectRestResponse getAll(ImageInformationDto imageInformationDto) {
return ObjectRestResponse.succ(baseBiz.selectList(imageInformationDto));
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/NewsInfoController.java
View file @ 586e3da3
......@@ -22,8 +22,13 @@ public class NewsInfoController extends BaseController<NewsInfoBiz, NewsInfo> {
}
@GetMapping(value = "/app/unauth/getAll")
public ObjectRestResponse getAll() {
return baseBiz.getAll();
public ObjectRestResponse getAll(NewsInfoDto newsInfoDto) {
return baseBiz.selectList(newsInfoDto);
}
@GetMapping(value = "/app/unauth/getHot")
public ObjectRestResponse getHotMsg() {
return baseBiz.getHotMsg();
}
@GetMapping(value = "/app/unauth/detail")
......
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/OrderEInvoiceController.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.controller;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.upyuns.platform.rs.website.biz.OrderEInvoiceBiz;
import com.upyuns.platform.rs.website.entity.OrderEInvoice;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("orderEInvoice")
public class OrderEInvoiceController extends BaseController<OrderEInvoiceBiz,OrderEInvoice> {
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/OrderInfoController.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.controller;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.upyuns.platform.rs.website.biz.OrderInfoBiz;
import com.upyuns.platform.rs.website.entity.OrderInfo;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("orderInfo")
public class OrderInfoController extends BaseController<OrderInfoBiz,OrderInfo> {
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/OrderItemController.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.controller;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.upyuns.platform.rs.website.biz.OrderItemBiz;
import com.upyuns.platform.rs.website.entity.OrderItem;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("orderItem")
public class OrderItemController extends BaseController<OrderItemBiz,OrderItem> {
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/ShoppingCartInfoController.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.controller;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.upyuns.platform.rs.website.biz.ShoppingCartInfoBiz;
import com.upyuns.platform.rs.website.entity.ShoppingCartInfo;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("shoppingCartInfo")
public class ShoppingCartInfoController extends BaseController<ShoppingCartInfoBiz,ShoppingCartInfo> {
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/UserInvoiceController.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.controller;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.upyuns.platform.rs.website.biz.UserInvoiceBiz;
import com.upyuns.platform.rs.website.dto.UserInvoiceDto;
import com.upyuns.platform.rs.website.entity.UserInvoice;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("userInvoice")
public class UserInvoiceController extends BaseController<UserInvoiceBiz,UserInvoice> {
@PostMapping(value = "addUpdate")
public ObjectRestResponse addUpdate(@RequestBody UserInvoice userInvoice) {
return baseBiz.addUpdate(userInvoice);
}
@GetMapping(value = "getList")
public ObjectRestResponse getList(UserInvoiceDto userInvoiceDto) {
return baseBiz.getList(userInvoiceDto);
}
@GetMapping(value = "getUserList")
public ObjectRestResponse getUserList(UserInvoiceDto userInvoiceDto) {
return baseBiz.getUserInvoiceInfo(userInvoiceDto);
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/mapper/ImageInfoRelationMapper.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.mapper;
import com.upyuns.platform.rs.website.entity.ImageInfoRelation;
import tk.mybatis.mapper.common.Mapper;
/**
* 影像图库上传图片关联信息
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-04 14:38:23
*/
public interface ImageInfoRelationMapper extends Mapper<ImageInfoRelation> {
}
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/mapper/OrderEInvoiceMapper.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.mapper;
import com.upyuns.platform.rs.website.entity.OrderEInvoice;
import tk.mybatis.mapper.common.Mapper;
/**
* 订单发票
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
public interface OrderEInvoiceMapper extends Mapper<OrderEInvoice> {
}
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/mapper/OrderInfoMapper.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.mapper;
import com.upyuns.platform.rs.website.entity.OrderInfo;
import tk.mybatis.mapper.common.Mapper;
/**
* 订单信息
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
public interface OrderInfoMapper extends Mapper<OrderInfo> {
}
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/mapper/OrderItemMapper.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.mapper;
import com.upyuns.platform.rs.website.entity.OrderItem;
import tk.mybatis.mapper.common.Mapper;
/**
* 订单商品信息
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
public interface OrderItemMapper extends Mapper<OrderItem> {
}
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/mapper/ShoppingCartInfoMapper.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.mapper;
import com.upyuns.platform.rs.website.entity.ShoppingCartInfo;
import tk.mybatis.mapper.common.Mapper;
/**
* 购物车
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
public interface ShoppingCartInfoMapper extends Mapper<ShoppingCartInfo> {
}
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/mapper/UserInvoiceMapper.java 0 → 100644
View file @ 586e3da3
package com.upyuns.platform.rs.website.mapper;
import com.upyuns.platform.rs.website.entity.UserInvoice;
import tk.mybatis.mapper.common.Mapper;
/**
* 用户发票信息
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
*/
public interface UserInvoiceMapper extends Mapper<UserInvoice> {
}
rs-website/rs-website-server/src/main/resources/mapper/ImageInfoRelationMapper.xml 0 → 100644
View file @ 586e3da3
<?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.upyuns.platform.rs.website.mapper.ImageInfoRelationMapper">
</mapper>
\ No newline at end of file
rs-website/rs-website-server/src/main/resources/mapper/OrderEInvoiceMapper.xml 0 → 100644
View file @ 586e3da3
<?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.upyuns.platform.rs.website.mapper.OrderEInvoiceMapper">
</mapper>
\ No newline at end of file
rs-website/rs-website-server/src/main/resources/mapper/OrderInfoMapper.xml 0 → 100644
View file @ 586e3da3
<?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.upyuns.platform.rs.website.mapper.OrderInfoMapper">
</mapper>
\ No newline at end of file
rs-website/rs-website-server/src/main/resources/mapper/OrderItemMapper.xml 0 → 100644
View file @ 586e3da3
<?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.upyuns.platform.rs.website.mapper.OrderItemMapper">
</mapper>
\ No newline at end of file
rs-website/rs-website-server/src/main/resources/mapper/ShoppingCartInfoMapper.xml 0 → 100644
View file @ 586e3da3
<?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.upyuns.platform.rs.website.mapper.ShoppingCartInfoMapper">
</mapper>
\ No newline at end of file
rs-website/rs-website-server/src/main/resources/mapper/UserInvoiceMapper.xml 0 → 100644
View file @ 586e3da3
<?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.upyuns.platform.rs.website.mapper.UserInvoiceMapper">
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment