BY-Team
/
taomi-trade
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改发送实体

Browse Source
master
bynt 3 years ago
parent 5d0749ab67
commit 236088f593
6 changed files with 186 additions and 125 deletions
Show Stats Download Patch File Download Diff File

1
service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/AuthLoginController.java
Unescape Escape View File

@ -29,6 +29,7 @@ public class AuthLoginController {
private final SellerAccountService sellerAccountService;
@PostMapping("/login")
@ApiOperation("oauth2登录过程")
public CommonResult<String> sellerLogin(@Validated @RequestBody LoginVo vo, HttpServletRequest request) {
return sellerAccountService.sellerLogin(vo, request);
}

68
service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/entity/master/AutoTaskMessage.java
Unescape Escape View File

@ -1,20 +1,23 @@
package com.hchbox.entity.master;
import com.hchbox.model.entity.BaseAutoTaskMessage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
* @author Enzo
* @date 2021-7-15
*/
@Data
@Entity
@EqualsAndHashCode(callSuper = true)
@Table(name = "auto_task_message")
public class AutoTaskMessage implements Serializable {
public class AutoTaskMessage extends BaseAutoTaskMessage implements Serializable {
private static final long serialVersionUID = 4550554800647798909L;
@ -24,68 +27,7 @@ public class AutoTaskMessage implements Serializable {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column(name = "user_id")
@ApiModelProperty("用户id")
private Long userId;
@ApiModelProperty("状态值")
private Integer status;
@Column(name = "task_name")
@ApiModelProperty("任务名称")
private String taskName;
@Column(name = "seller_nick")
@ApiModelProperty("买家昵称")
private String sellerNick;
@Column(name = "task_info")
@ApiModelProperty("任务信息")
private String taskInfo;
@Column(name = "create_time")
@ApiModelProperty("创建时间")
private Date createTime;
@Column
@ApiModelProperty("修改时间")
private Date updateTime;
@Column(name = "start_date")
@ApiModelProperty("任务开始时间")
private Date startDate;
@Column(name = "end_date")
@ApiModelProperty("任务结束时间")
private Date endDate;
@Column(name = "is_finish")
@ApiModelProperty("默认未完成终止 1 明日再发")
private Boolean isFinish;
@Column(name = "is_retry")
@ApiModelProperty("重试次数 0 代表不重试")
private Boolean isRetry;
@Column(name = "template")
@ApiModelProperty("模板")
private String template;
@Column(name = "send_type")
@ApiModelProperty("0 应用dsr选中回访提交 1 为 手动提交 (应用 团队 后台 )")
private Integer sendType;
@Column(name = "stat_start_date")
@ApiModelProperty("统计开始时间")
private Date statStartDate;
@Column(name = "stat_end_date")
@ApiModelProperty("统计结束时间")
private Date statEndDt;
@Column(name = "stat_type")
@ApiModelProperty("统计类型")
private String statType;
}

58
service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/entity/master/AutoTaskMessageInfo.java
Unescape Escape View File

@ -1,11 +1,12 @@
package com.hchbox.entity.master;
import com.hchbox.model.entity.BaseAutoTaskMessageInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
* @author Enzo
@ -14,8 +15,9 @@ import java.util.Date;
*/
@Data
@Entity
@EqualsAndHashCode(callSuper = true)
@Table(name = "auto_task_message_info")
public class AutoTaskMessageInfo implements Serializable {
public class AutoTaskMessageInfo extends BaseAutoTaskMessageInfo implements Serializable {
private static final long serialVersionUID = 4158774664555395433L;
@ -26,58 +28,6 @@ public class AutoTaskMessageInfo implements Serializable {
private Long id;
@Column(name = "task_id")
@ApiModelProperty("任务id")
private Long taskId;
@ApiModelProperty("状态值")
private Integer status;
@ApiModelProperty("卖家昵称")
private String sellerNick;
@ApiModelProperty("买家昵称")
private String buyerNick;
@ApiModelProperty("订单编号")
private Long tid;
@ApiModelProperty("上一次提交id")
private Long oid;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
@ApiModelProperty("开始时间")
private Date startDt;
@ApiModelProperty("结束时间")
private Date endDt;
@ApiModelProperty("发送时间")
private Date sendDt;
@ApiModelProperty("信息")
private String info;
@ApiModelProperty("团队名称")
private String teamUsername;
@ApiModelProperty("消息昵称")
private String messageNick;
@ApiModelProperty("应用dsr选中回访提交 1 为 手动提交 (应用 团队 后台 )")
private Integer type;
@ApiModelProperty("重新提交id")
private Date resubmitDate;
@ApiModelProperty("发送类型")
private Integer sendType;

9
service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/TopTradeRepository.java
Unescape Escape View File

@ -33,12 +33,5 @@ public interface TopTradeRepository extends JpaRepository<TopTrade, Long>, JpaSp
@Query(value = "update top_trade t set t.status = ?1 where t.tid = ?2",nativeQuery = true)
void updateOrderStatus(String status,Long tid);
/**
* 条件查询
* @param pageable
* @param aLong
* @return
*/
@Query("from TopTrade b where b.userId = :userId")
Page<Blacklist> queryTradeList(Pageable pageable, Long aLong);
}

90
trade-common/src/main/java/com/hchbox/model/entity/BaseAutoTaskMessage.java
Unescape Escape View File

@ -0,0 +1,90 @@
package com.hchbox.model.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.Column;
import javax.persistence.EntityListeners;
import javax.persistence.MappedSuperclass;
import java.io.Serializable;
import java.util.Date;
/**
* @author Enzo
* @date 2021-7-15
*/
@Getter
@Setter
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public class BaseAutoTaskMessage implements Serializable {
private static final long serialVersionUID = 243031457155955953L;
@Column(name = "user_id")
@ApiModelProperty("用户id")
private Long userId;
@ApiModelProperty("状态值")
private Integer status;
@Column(name = "task_name")
@ApiModelProperty("任务名称")
private String taskName;
@Column(name = "seller_nick")
@ApiModelProperty("买家昵称")
private String sellerNick;
@Column(name = "task_info")
@ApiModelProperty("任务信息")
private String taskInfo;
@Column(name = "create_time")
@ApiModelProperty("创建时间")
private Date createTime;
@Column
@ApiModelProperty("修改时间")
private Date updateTime;
@Column(name = "start_date")
@ApiModelProperty("任务开始时间")
private Date startDate;
@Column(name = "end_date")
@ApiModelProperty("任务结束时间")
private Date endDate;
@Column(name = "is_finish")
@ApiModelProperty("默认未完成终止 1 明日再发")
private Boolean isFinish;
@Column(name = "is_retry")
@ApiModelProperty("重试次数 0 代表不重试")
private Boolean isRetry;
@Column(name = "template")
@ApiModelProperty("模板")
private String template;
@Column(name = "send_type")
@ApiModelProperty("0 应用dsr选中回访提交 1 为 手动提交 (应用 团队 后台 )")
private Integer sendType;
@Column(name = "stat_start_date")
@ApiModelProperty("统计开始时间")
private Date statStartDate;
@Column(name = "stat_end_date")
@ApiModelProperty("统计结束时间")
private Date statEndDt;
@Column(name = "stat_type")
@ApiModelProperty("统计类型")
private String statType;
}

85
trade-common/src/main/java/com/hchbox/model/entity/BaseAutoTaskMessageInfo.java
Unescape Escape View File

@ -0,0 +1,85 @@
package com.hchbox.model.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.Column;
import javax.persistence.EntityListeners;
import javax.persistence.MappedSuperclass;
import java.io.Serializable;
import java.util.Date;
/**
* @author Enzo
* @date 2021-7-15
* 自动发送任务信息
*/
@Getter
@Setter
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public class BaseAutoTaskMessageInfo implements Serializable {
private static final long serialVersionUID = 4158774664555395433L;
@Column(name = "task_id")
@ApiModelProperty("任务id")
private Long taskId;
@ApiModelProperty("状态值")
private Integer status;
@ApiModelProperty("卖家昵称")
private String sellerNick;
@ApiModelProperty("买家昵称")
private String buyerNick;
@ApiModelProperty("订单编号")
private Long tid;
@ApiModelProperty("上一次提交id")
private Long oid;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
@ApiModelProperty("开始时间")
private Date startDt;
@ApiModelProperty("结束时间")
private Date endDt;
@ApiModelProperty("发送时间")
private Date sendDt;
@ApiModelProperty("信息")
private String info;
@ApiModelProperty("团队名称")
private String teamUsername;
@ApiModelProperty("消息昵称")
private String messageNick;
@ApiModelProperty("应用dsr选中回访提交 1 为 手动提交 (应用 团队 后台 )")
private Integer type;
@ApiModelProperty("重新提交id")
private Date resubmitDate;
@ApiModelProperty("发送类型")
private Integer sendType;
}
Write Preview
Loading…
Cancel
Save