调整订单表的实体和配置文件

master
wujingtao 3 years ago
parent 094a7b1a22
commit 6d7f8119f6

@ -55,4 +55,10 @@ public class WwRemindController {
public CommonResult<Object> wwDelayRemindController() { public CommonResult<Object> wwDelayRemindController() {
return new CommonResult<>().success(delayRemindService.selectDelayRemind()); return new CommonResult<>().success(delayRemindService.selectDelayRemind());
} }
@GetMapping("/test")
@ApiOperation("接受消息")
public String test() {
return "测试成功";
}
} }

@ -35,7 +35,6 @@ public class ConfirmReceiptJob implements SimpleJob {
@Override @Override
public void execute(ShardingContext shardingContext) { public void execute(ShardingContext shardingContext) {
// log.info("我是 {} 分片项: {} ,{} ", "ConfirmReceiptJob", shardingContext.getShardingItem(), DateUtil.now());
confirmReceiptJob.timerTaskService.sendMessage(AppSettingTypeEnum.CONFIRM_RECEIPT_REMINDER.getType()); confirmReceiptJob.timerTaskService.sendMessage(AppSettingTypeEnum.CONFIRM_RECEIPT_REMINDER.getType());
} }
} }

@ -35,7 +35,6 @@ public class EvaluateRemindJob implements SimpleJob {
@Override @Override
public void execute(ShardingContext shardingContext) { public void execute(ShardingContext shardingContext) {
// log.info("我是 {} 分片项: {} ,{} ", "EvaluateRemindJob", shardingContext.getShardingItem(), DateUtil.now()); evaluateRemindJob.timerTaskService.sendMessage(AppSettingTypeEnum.MESSAGE_REMINDER.getType());
// evaluateRemindJob.timerTaskService.sendMessage(AppSettingTypeEnum.MESSAGE_REMINDER.getType());
} }
} }

@ -36,8 +36,7 @@ public class NegativeJob implements SimpleJob {
@Override @Override
public void execute(ShardingContext shardingContext) { public void execute(ShardingContext shardingContext) {
// log.info("我是 {} 分片项: {} ,{} ", "NegativeJob", shardingContext.getShardingItem(), DateUtil.now()); negativeJob.timerTaskService.sendMessage(AppSettingTypeEnum.MESSAGE_BAD_REVIEW.getType());
// negativeJob.timerTaskService.sendMessage(AppSettingTypeEnum.MESSAGE_BAD_REVIEW.getType());
} }
} }

@ -34,7 +34,6 @@ public class PaymentRemindJob implements SimpleJob {
@Override @Override
public void execute(ShardingContext shardingContext) { public void execute(ShardingContext shardingContext) {
// log.info("我是 {} 分片项: {} ,{} ", "PaymentRemindJob", shardingContext.getShardingItem(), DateUtil.now()); paymentRemindJob.timerTaskService.sendMessage(AppSettingTypeEnum.MESSAGE_PAY_REMIND.getType());
// paymentRemindJob.timerTaskService.sendMessage(AppSettingTypeEnum.MESSAGE_PAY_REMIND.getType());
} }
} }

@ -35,8 +35,7 @@ public class PositiveThankJob implements SimpleJob {
@Override @Override
public void execute(ShardingContext shardingContext) { public void execute(ShardingContext shardingContext) {
// log.info("我是 {} 分片项: {} ,{} ", "PositiveThankJob", shardingContext.getShardingItem(), DateUtil.now()); positiveThankJob.timerTaskService.sendMessage(AppSettingTypeEnum.MESSAGE_PRAISE.getType());
// positiveThankJob.timerTaskService.sendMessage(AppSettingTypeEnum.MESSAGE_PRAISE.getType());
} }
} }

@ -34,7 +34,6 @@ public class ReturnRemindJob implements SimpleJob {
@Override @Override
public void execute(ShardingContext shardingContext) { public void execute(ShardingContext shardingContext) {
// log.info("我是 {} 分片项: {} ,{} ", "ReturnRemindJob", shardingContext.getShardingItem(), DateUtil.now()); returnRemindJob.timerTaskService.sendMessage(AppSettingTypeEnum.MESSAGE_RETURN_REMINDER.getType());
// returnRemindJob.timerTaskService.sendMessage(AppSettingTypeEnum.MESSAGE_RETURN_REMINDER.getType());
} }
} }

@ -1,7 +1,6 @@
package com.hchbox.jpa; package com.hchbox.jpa;
import com.hchbox.jpa.entity.AutoWaitMessage; import com.hchbox.jpa.entity.AutoWaitMessage;
import com.hchbox.jpa.entity.TaskSendMessage;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;

@ -1,161 +1,27 @@
package com.hchbox.jpa.entity; package com.hchbox.jpa.entity;
import cn.hutool.core.bean.BeanUtil; import com.hchbox.model.entity.BaseTrade;
import cn.hutool.core.bean.copier.CopyOptions;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.persistence.*; import javax.persistence.*;
import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* @website https://el-admin.vip * @author Enzo
* @description / * @website https://el-admin.vip
* @author Enzo * @description /
* @date 2021-08-13 * @date 2021-08-13
**/ **/
@Data @Data
@Entity @Entity
@Table(name="top_order") @Table(name = "top_order")
public class TopOrder implements Serializable { public class TopOrder extends BaseTrade implements Serializable {
private static final long serialVersionUID = 7788712870573889428L; private static final long serialVersionUID = 7788712870573889428L;
@Id @Id
@Column(name = "order_id") @Column(name = "order_id")
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id; private Long orderId;
@Column(name = "tid",nullable = false)
@NotNull
@ApiModelProperty(value = "订单id")
private Long tid;
@Column(name = "created")
@ApiModelProperty(value = "创建时间")
private Date created;
@Column(name = "adjust_fee")
@ApiModelProperty(value = "手工调整金额.格式为:1.01;单位:元;精确到小数点后两位")
private String adjustFee;
@Column(name = "buyer_nick")
@ApiModelProperty(value = "买家昵称")
private String buyerNick;
@Column(name = "buyer_rate")
@ApiModelProperty(value = "买家是否已评价。可选值true(已评价)false(未评价)")
private Integer buyerRate;
@Column(name = "cid")
@ApiModelProperty(value = "交易商品对应的类目ID")
private Long cid;
@Column(name = "discount_fee")
@ApiModelProperty(value = "子订单级订单优惠金额。")
private String discountFee;
@Column(name = "end_time")
@ApiModelProperty(value = "交易结束时间。")
private Date endTime;
@Column(name = "iid")
@ApiModelProperty(value = "商品的字符串编号")
private String iid;
@Column(name = "is_oversold")
@ApiModelProperty(value = "是否超卖")
private Integer isOversold;
@Column(name = "is_service_order")
@ApiModelProperty(value = "是否是服务订单是返回true否返回false。")
private Integer isServiceOrder;
@Column(name = "item_meal_id")
@ApiModelProperty(value = "套餐ID")
private Long itemMealId;
@Column(name = "modified")
@ApiModelProperty(value = "订单修改时间")
private Date modified;
@Column(name = "num")
@ApiModelProperty(value = "商品购买数量")
private Long num;
@Column(name = "num_iid")
@ApiModelProperty(value = "商品数字编号")
private Long numIid;
@Column(name = "oid",nullable = false)
@NotNull
@ApiModelProperty(value = "虚拟服务子订单订单号")
private Long oid;
@Column(name = "order_from")
@ApiModelProperty(value = "子订单来源")
private String orderFrom;
@Column(name = "outer_iid")
@ApiModelProperty(value = "商家外部编码")
private String outerIid;
@Column(name = "outer_sku_id")
@ApiModelProperty(value = "外部网店自己定义的Sku编号")
private String outerSkuId;
@Column(name = "payment")
@ApiModelProperty(value = "子订单实付金额")
private String payment;
@Column(name = "price")
@ApiModelProperty(value = "商品价格")
private String price;
@Column(name = "refund_id")
@ApiModelProperty(value = "最近退款ID")
private Long refundId;
@Column(name = "refund_status")
@ApiModelProperty(value = "退款状态")
private String refundStatus;
@Column(name = "seller_nick")
@ApiModelProperty(value = "卖家昵称")
private String sellerNick;
@Column(name = "seller_rate")
@ApiModelProperty(value = "卖家是否已评价")
private Integer sellerRate;
@Column(name = "sku_id")
@ApiModelProperty(value = "商品的最小库存单位Sku的id")
private String skuId;
@Column(name = "status")
@ApiModelProperty(value = "交易状态")
private String status;
@Column(name = "timeout_action_time")
@ApiModelProperty(value = "订单快照详细信息")
private Date timeoutActionTime;
@Column(name = "title")
@ApiModelProperty(value = "商品标题")
private String title;
@Column(name = "total_fee")
@ApiModelProperty(value = "应付金额")
private String totalFee;
@JoinColumn(name = "id")
@ApiModelProperty(value = "总订单")
@ManyToOne(cascade = {CascadeType.MERGE, CascadeType.REFRESH}, optional = false)
private TopTrade topTrade;
public void copy(TopOrder source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}
} }

@ -1,14 +1,11 @@
package com.hchbox.jpa.entity; package com.hchbox.jpa.entity;
import cn.hutool.core.bean.BeanUtil; import com.hchbox.model.entity.BaseTrade;
import cn.hutool.core.bean.copier.CopyOptions;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.persistence.*; import javax.persistence.*;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import java.util.List;
/** /**
* @author Enzo * @author Enzo
@ -19,320 +16,12 @@ import java.util.List;
@Entity @Entity
@Data @Data
@Table(name = "top_trade") @Table(name = "top_trade")
public class TopTrade implements Serializable { public class TopTrade extends BaseTrade implements Serializable {
private static final long serialVersionUID = -7591788824668705732L;
private static final long serialVersionUID = -6270860811404254046L;
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id") @Column(name = "id")
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
private Long id; private Long id;
@Column(name = "gmt_sync")
@ApiModelProperty(value = "创建时间")
private Date gmtSync;
@Column(name = "gmt_last_sync")
@ApiModelProperty(value = "修改时间")
private Date gmtLastSync;
@Column(name = "adjust_fee")
@ApiModelProperty(value = "卖家手工调整金额")
private String adjustFee;
@Column(name = "alipay_id")
@ApiModelProperty(value = "支付宝id")
private Long alipayId;
@Column(name = "alipay_no")
@ApiModelProperty(value = "支付宝账号")
private String alipayNo;
@Column(name = "area_id")
@ApiModelProperty(value = "地区id")
private String areaId;
@Column(name = "available_confirm_fee")
@ApiModelProperty(value = "可确认费用")
private String availableConfirmFee;
@Column(name = "buyer_alipay_no")
@ApiModelProperty(value = "买家支付宝账号")
private String buyerAlipayNo;
@Column(name = "buyer_area")
@ApiModelProperty(value = "买家地区")
private String buyerArea;
@Column(name = "buyer_cod_fee")
@ApiModelProperty(value = "买家货到付款费用")
private String buyerCodFee;
@Column(name = "buyer_email")
@ApiModelProperty(value = "买家邮箱")
private String buyerEmail;
@Column(name = "buyer_flag")
@ApiModelProperty(value = "买家备注旗帜")
private Long buyerFlag;
@Column(name = "buyer_nick")
@ApiModelProperty(value = "买家昵称")
private String buyerNick;
@Column(name = "buyer_obtain_point_fee")
@ApiModelProperty(value = "买家获得积分费")
private Long buyerObtainPointFee;
@Column(name = "buyer_rate")
@ApiModelProperty(value = "买家是否已评价")
private Integer buyerRate;
@Column(name = "can_rate")
@ApiModelProperty(value = "是否能评价")
private Integer canRate;
@Column(name = "cod_fee")
@ApiModelProperty(value = "货到付款服务费")
private String codFee;
@Column(name = "cod_status")
@ApiModelProperty(value = "佣金")
private String codStatus;
@Column(name = "commission_fee")
@ApiModelProperty(value = " 卖家发货时间")
private String commissionFee;
@Column(name = "consign_time")
@ApiModelProperty(value = "卖家发货时间")
private Date consignTime;
@Column(name = "created")
@ApiModelProperty(value = "交易创建时间")
private Date created;
@Column(name = "credit_card_fee")
@ApiModelProperty(value = "使用信用卡支付金额数")
private String creditCardFee;
@Column(name = "discount_fee")
@ApiModelProperty(value = "系统优惠金额")
private String discountFee;
@Column(name = "end_time")
@ApiModelProperty(value = "交易结束时间")
private Date endTime;
@Column(name = "express_agency_fee")
@ApiModelProperty(value = "快递代理费")
private String expressAgencyFee;
@Column(name = "has_buyer_message")
@ApiModelProperty(value = "是否包含购买者信息")
private Integer hasBuyerMessage;
@Column(name = "has_post_fee")
@ApiModelProperty(value = "是否包含邮费")
private Integer hasPostFee;
@Column(name = "has_yfx")
@ApiModelProperty(value = "订单中是否包含运费险订单")
private Integer hasYfx;
@Column(name = "iid")
@ApiModelProperty(value = "商品的字符串编号")
private String iid;
@Column(name = "is_brand_sale")
@ApiModelProperty(value = "是否品牌特卖")
private Integer isBrandSale;
@Column(name = "is_force_wlb")
@ApiModelProperty(value = "isForceWlb")
private Integer isForceWlb;
@Column(name = "modified")
@ApiModelProperty(value = "订单修改时间")
private Date modified;
@Column(name = "num")
@ApiModelProperty(value = "购买数量")
private Long num;
@Column(name = "num_iid")
@ApiModelProperty(value = "商品数字编号")
private Long numIid;
@Column(name = "pay_time")
@ApiModelProperty(value = "支付时间")
private Date payTime;
@Column(name = "payment")
@ApiModelProperty(value = "实付金额")
private String payment;
@Column(name = "point_fee")
@ApiModelProperty(value = "积分金额")
private Long pointFee;
@Column(name = "post_fee")
@ApiModelProperty(value = "邮费")
private String postFee;
@Column(name = "price")
@ApiModelProperty(value = "商品价格")
private String price;
@Column(name = "real_point_fee")
@ApiModelProperty(value = "实际支付积分")
private Long realPointFee;
@Column(name = "received_payment")
@ApiModelProperty(value = "卖家实际收到的支付宝打款金额")
private String receivedPayment;
@Column(name = "receiver_address")
@ApiModelProperty(value = "收货人的详细地址")
private String receiverAddress;
@Column(name = "receiver_city")
@ApiModelProperty(value = "收货人的所在城市")
private String receiverCity;
@Column(name = "receiver_district")
@ApiModelProperty(value = "收货人的所在地区")
private String receiverDistrict;
@Column(name = "receiver_mobile")
@ApiModelProperty(value = "收货人的手机号码")
private String receiverMobile;
@Column(name = "receiver_name")
@ApiModelProperty(value = "收货人的姓名")
private String receiverName;
@Column(name = "receiver_phone")
@ApiModelProperty(value = "收货人的电话号码")
private String receiverPhone;
@Column(name = "receiver_state")
@ApiModelProperty(value = "收货人的所在省份")
private String receiverState;
@Column(name = "receiver_zip")
@ApiModelProperty(value = "收货人的邮编")
private String receiverZip;
@Column(name = "seller_alipay_no")
@ApiModelProperty(value = "卖家支付宝账号")
private String sellerAlipayNo;
@Column(name = "seller_cod_fee")
@ApiModelProperty(value = "卖家货到付款费用")
private String sellerCodFee;
@Column(name = "seller_email")
@ApiModelProperty(value = "卖家邮箱")
private String sellerEmail;
@Column(name = "seller_flag")
@ApiModelProperty(value = "卖家备注旗帜")
private Long sellerFlag;
@Column(name = "seller_mobile")
@ApiModelProperty(value = "卖家手机号码")
private String sellerMobile;
@Column(name = "seller_name")
@ApiModelProperty(value = "卖家姓名")
private String sellerName;
@Column(name = "seller_nick")
@ApiModelProperty(value = "卖家昵称")
private String sellerNick;
@Column(name = "seller_phone")
@ApiModelProperty(value = "卖家电环号码")
private String sellerPhone;
@Column(name = "seller_rate")
@ApiModelProperty(value = "卖家是否已评价")
private Integer sellerRate;
@Column(name = "send_time")
@ApiModelProperty(value = "发送时间")
private String sendTime;
@Column(name = "shipping_type")
@ApiModelProperty(value = "子订单的运送方式")
private String shippingType;
@Column(name = "status")
@ApiModelProperty(value = "订单状态")
private String status;
@Column(name = "step_paid_fee")
@ApiModelProperty(value = "分阶段付款的已付金额")
private String stepPaidFee;
@Column(name = "step_trade_status")
@ApiModelProperty(value = "分阶段付款的订单状态")
private String stepTradeStatus;
@Column(name = "tid")
@ApiModelProperty(value = "交易编号")
private Long tid;
@Column(name = "timeout_action_time")
@ApiModelProperty(value = "订单超时到期时间")
private Date timeoutActionTime;
@Column(name = "title")
@ApiModelProperty(value = " 交易标题")
private String title;
@Column(name = "total_fee")
@ApiModelProperty(value = "商品金额")
private String totalFee;
@Column(name = "trade_from")
@ApiModelProperty(value = "交易内部来源")
private String tradeFrom;
@Column(name = "trade_source")
@ApiModelProperty(value = "订单来源")
private String tradeSource;
@Column(name = "type")
@ApiModelProperty(value = "交易类型")
private String type;
@Column(name = "yfx_fee")
@ApiModelProperty(value = "运费险金额")
private String yfxFee;
@Column(name = "yfx_id")
@ApiModelProperty(value = "运费险id")
private String yfxId;
@Column(name = "yfx_type")
@ApiModelProperty(value = "运费险类型")
private Long yfxType;
@Column(name = "update_status")
@ApiModelProperty(value = "修改状态")
private Integer updateStatus;
@Column(name = "oaid")
@ApiModelProperty(value = "修改状态")
private String oaid;
@OneToMany(mappedBy = "topTrade", fetch = FetchType.LAZY)
@ApiModelProperty("订单集合")
private List<TopOrder> orders;
public void copy(TopTrade source) {
BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
}
} }

@ -89,8 +89,7 @@ public class RemindTemplates {
RemindTemplates.PAY_TIME, DateUtil.format(trade.getPayTime(), TimeConstants.MM_DD_HH_MM)); RemindTemplates.PAY_TIME, DateUtil.format(trade.getPayTime(), TimeConstants.MM_DD_HH_MM));
} }
String itemTitle = trade.getOrders() != null ? String itemTitle = trade.getTitle();
trade.getOrders().get(DefaultNumberConstants.ZERO_NUMBER).getTitle() : trade.getTitle();
// 替换团队标题 // 替换团队标题
template = StrUtil.replace(template, template = StrUtil.replace(template,
RemindTemplates.ITEM_TITLE, itemTitle); RemindTemplates.ITEM_TITLE, itemTitle);

@ -1,7 +1,7 @@
spring: spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.jdbc.Driver
# 使用 alibaba druid 连接池、监控 # 使用 alibaba druid 连接池、监控
druid: druid:
url: jdbc:mysql://118.178.137.129:3306/taomi?useUnicode=true&CharSet=utf8mb4&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&autoReconnectForPools=true&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai url: jdbc:mysql://118.178.137.129:3306/taomi?useUnicode=true&CharSet=utf8mb4&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&autoReconnectForPools=true&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
@ -33,7 +33,6 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: ${NACOS_HOST:172.26.59.86}:${NACOS_PORT:8848} server-addr: ${NACOS_HOST:118.178.137.129}:${NACOS_PORT:8848}
# jpa: # jpa:
# show-sql: true # show-sql: true

@ -1,12 +1,16 @@
spring: spring:
datasource: datasource:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.jdbc.Driver
# 使用 alibaba druid 连接池、监控 # 使用 alibaba druid 连接池、监控
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
druid: druid:
url: jdbc:mysql://rm-k2j2i9zbxrp3q57h3.mysql.zhangbei.rds.aliyuncs.com:3306/taomi?useUnicode=true&CharSet=utf8mb4&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&autoReconnectForPools=true&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai # url: jdbc:mysql://rm-k2j2i9zbxrp3q57h3.mysql.zhangbei.rds.aliyuncs.com:3306/taomi?useUnicode=true&CharSet=utf8mb4&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&autoReconnectForPools=true&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
# username: root
# password: baiye@RDS2021
#暂时用的测试数据库,后面更换
url: jdbc:mysql://118.178.137.129:3306/taomi?useUnicode=true&CharSet=utf8mb4&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&autoReconnectForPools=true&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
username: root username: root
password: baiye@RDS2021 password: root
initial-size: 2 initial-size: 2
min-idle: 5 min-idle: 5
max-active: 10 max-active: 10

@ -2,10 +2,10 @@ spring:
application: application:
name: @artifactId@ name: @artifactId@
profiles: profiles:
active: dev active: prod
server: server:
port: 8862 port: 886
# 必须配置 # 必须配置
feign: feign:

Loading…
Cancel
Save