Commit 4532c692 by fanjiaxin

推客分佣单入库

parent 45cf8fd2
Pipeline #75679 passed with stages
in 1 minute 7 seconds
...@@ -3,6 +3,7 @@ ALTER TABLE `SHARER_INFO` ADD `id_card_number` varchar(32) NOT NULL DEFAULT '' C ...@@ -3,6 +3,7 @@ ALTER TABLE `SHARER_INFO` ADD `id_card_number` varchar(32) NOT NULL DEFAULT '' C
ALTER TABLE `SHARER_INFO` ADD `mobile_phone` varchar(16) NOT NULL DEFAULT '' COMMENT '手机号' AFTER `id_card_number`; ALTER TABLE `SHARER_INFO` ADD `mobile_phone` varchar(16) NOT NULL DEFAULT '' COMMENT '手机号' AFTER `id_card_number`;
DROP TABLE `SHARER_ORDER_SYNC_FAIL`;
CREATE TABLE `SHARER_ORDER_SYNC_FAIL` ( CREATE TABLE `SHARER_ORDER_SYNC_FAIL` (
`id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', `id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
`order_id` varchar(64) NOT NULL DEFAULT '' COMMENT '订单号', `order_id` varchar(64) NOT NULL DEFAULT '' COMMENT '订单号',
...@@ -16,14 +17,15 @@ CREATE TABLE `SHARER_ORDER_SYNC_FAIL` ( ...@@ -16,14 +17,15 @@ CREATE TABLE `SHARER_ORDER_SYNC_FAIL` (
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单同步失败表'; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单同步失败表';
DROP TABLE `SHARER_ORDER`;
CREATE TABLE `SHARER_ORDER` ( CREATE TABLE `SHARER_ORDER` (
`id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', `id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
`order_id` varchar(64) NOT NULL DEFAULT '' COMMENT '订单号', `order_id` varchar(64) NOT NULL DEFAULT '' COMMENT '订单号',
`sku_id` varchar(64) NOT NULL DEFAULT '' COMMENT '商品skuid', `sku_id` varchar(64) NOT NULL DEFAULT '' COMMENT '商品skuid',
`commission_status` varchar(32) NOT NULL DEFAULT '' COMMENT '佣金单状态', `commission_status` varchar(32) NOT NULL DEFAULT '' COMMENT '佣金单状态',
`order_status` varchar(32) NOT NULL DEFAULT '' COMMENT '订单状态', `order_status` varchar(32) NOT NULL DEFAULT '' COMMENT '订单状态',
`order_create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '订单创建时间', `order_create_time` int unsigned NOT NULL DEFAULT 0 COMMENT '订单创建时间',
`order_update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '订单更新时间', `order_update_time` int unsigned NOT NULL DEFAULT 0 COMMENT '订单更新时间',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
...@@ -31,6 +33,7 @@ CREATE TABLE `SHARER_ORDER` ( ...@@ -31,6 +33,7 @@ CREATE TABLE `SHARER_ORDER` (
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单表'; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单表';
DROP TABLE `SHARER_ORDER_PRODUCT`;
CREATE TABLE `SHARER_ORDER_PRODUCT` ( CREATE TABLE `SHARER_ORDER_PRODUCT` (
`id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', `id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
`sharer_order_id` bigint(32) unsigned NOT NULL COMMENT '佣金单ID', `sharer_order_id` bigint(32) unsigned NOT NULL COMMENT '佣金单ID',
...@@ -46,12 +49,13 @@ CREATE TABLE `SHARER_ORDER_PRODUCT` ( ...@@ -46,12 +49,13 @@ CREATE TABLE `SHARER_ORDER_PRODUCT` (
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单商品表'; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单商品表';
DROP TABLE `SHARER_ORDER_COMMISSION`;
CREATE TABLE `SHARER_ORDER_COMMISSION` ( CREATE TABLE `SHARER_ORDER_COMMISSION` (
`id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', `id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
`sharer_order_id` bigint(32) unsigned NOT NULL COMMENT '佣金单ID', `sharer_order_id` bigint(32) unsigned NOT NULL COMMENT '佣金单ID',
`service_ratio` int unsigned NOT NULL DEFAULT 0 COMMENT '服务费率[0, 1000000]', `service_ratio` int unsigned NOT NULL DEFAULT 0 COMMENT '服务费率[0, 1000000]',
`service_amount` int unsigned NOT NULL DEFAULT 0 COMMENT '服务费金额', `service_amount` int unsigned NOT NULL DEFAULT 0 COMMENT '服务费金额',
`profit_sharding_suc_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '服务费结算时间', `profit_sharding_suc_time` int unsigned NOT NULL DEFAULT 0 COMMENT '服务费结算时间',
`promotion_channel` int unsigned NOT NULL DEFAULT 1 COMMENT '0-橱窗带货,1-推客带货', `promotion_channel` int unsigned NOT NULL DEFAULT 1 COMMENT '0-橱窗带货,1-推客带货',
`promotion_info` text DEFAULT NULL COMMENT '作为推客的时候,推广的一些参数', `promotion_info` text DEFAULT NULL COMMENT '作为推客的时候,推广的一些参数',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
...@@ -61,6 +65,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION` ( ...@@ -61,6 +65,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION` (
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单分佣表'; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单分佣表';
DROP TABLE `SHARER_ORDER_COMMISSION_SHARER`;
CREATE TABLE `SHARER_ORDER_COMMISSION_SHARER` ( CREATE TABLE `SHARER_ORDER_COMMISSION_SHARER` (
`id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', `id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
`sharer_order_id` bigint(32) unsigned NOT NULL COMMENT '佣金单ID', `sharer_order_id` bigint(32) unsigned NOT NULL COMMENT '佣金单ID',
...@@ -78,7 +83,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION_SHARER` ( ...@@ -78,7 +83,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION_SHARER` (
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单分佣推客表'; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单分佣推客表';
DROP TABLE `SHARER_ORDER_COMMISSION_SUB_AGENCY`;
CREATE TABLE `SHARER_ORDER_COMMISSION_SUB_AGENCY` ( CREATE TABLE `SHARER_ORDER_COMMISSION_SUB_AGENCY` (
`id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', `id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
`sharer_order_id` bigint(32) unsigned NOT NULL COMMENT '佣金单ID', `sharer_order_id` bigint(32) unsigned NOT NULL COMMENT '佣金单ID',
...@@ -87,7 +92,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION_SUB_AGENCY` ( ...@@ -87,7 +92,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION_SUB_AGENCY` (
`nickname` varchar(128) NOT NULL DEFAULT '' COMMENT '帮卖机构昵称', `nickname` varchar(128) NOT NULL DEFAULT '' COMMENT '帮卖机构昵称',
`ratio` int unsigned NOT NULL DEFAULT 0 COMMENT '帮卖机构服务费率[0, 1000000]', `ratio` int unsigned NOT NULL DEFAULT 0 COMMENT '帮卖机构服务费率[0, 1000000]',
`amount` int unsigned NOT NULL DEFAULT 0 COMMENT '帮卖机构服务费', `amount` int unsigned NOT NULL DEFAULT 0 COMMENT '帮卖机构服务费',
`profit_sharding_suc_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '帮卖机构服务费结算时间', `profit_sharding_suc_time` int unsigned NOT NULL DEFAULT 0 COMMENT '帮卖机构服务费结算时间',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
...@@ -96,7 +101,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION_SUB_AGENCY` ( ...@@ -96,7 +101,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION_SUB_AGENCY` (
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单分佣帮卖机构表'; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单分佣帮卖机构表';
DROP TABLE `SHARER_ORDER_COMMISSION_PROMOTER_AGENCY`;
CREATE TABLE `SHARER_ORDER_COMMISSION_PROMOTER_AGENCY` ( CREATE TABLE `SHARER_ORDER_COMMISSION_PROMOTER_AGENCY` (
`id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', `id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
`sharer_order_id` bigint(32) unsigned NOT NULL COMMENT '佣金单ID', `sharer_order_id` bigint(32) unsigned NOT NULL COMMENT '佣金单ID',
...@@ -105,7 +110,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION_PROMOTER_AGENCY` ( ...@@ -105,7 +110,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION_PROMOTER_AGENCY` (
`nickname` varchar(128) NOT NULL DEFAULT '' COMMENT '推客机构昵称', `nickname` varchar(128) NOT NULL DEFAULT '' COMMENT '推客机构昵称',
`ratio` int unsigned NOT NULL DEFAULT 0 COMMENT '推客机构服务费率[0, 1000000]', `ratio` int unsigned NOT NULL DEFAULT 0 COMMENT '推客机构服务费率[0, 1000000]',
`amount` int unsigned NOT NULL DEFAULT 0 COMMENT '推客机构服务费', `amount` int unsigned NOT NULL DEFAULT 0 COMMENT '推客机构服务费',
`profit_sharding_suc_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '推客机构服务费结算时间', `profit_sharding_suc_time` int unsigned NOT NULL DEFAULT 0 COMMENT '推客机构服务费结算时间',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
...@@ -114,6 +119,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION_PROMOTER_AGENCY` ( ...@@ -114,6 +119,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION_PROMOTER_AGENCY` (
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单分佣推客机构表'; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单分佣推客机构表';
DROP TABLE `SHARER_ORDER_COMMISSION_TALENT`;
CREATE TABLE `SHARER_ORDER_COMMISSION_TALENT` ( CREATE TABLE `SHARER_ORDER_COMMISSION_TALENT` (
`id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', `id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
`sharer_order_id` bigint(32) NOT NULL COMMENT '佣金单ID', `sharer_order_id` bigint(32) NOT NULL COMMENT '佣金单ID',
...@@ -131,7 +137,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION_TALENT` ( ...@@ -131,7 +137,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION_TALENT` (
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单分佣达人表'; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单分佣达人表';
DROP TABLE `SHARER_ORDER_COMMISSION_FINDER`;
CREATE TABLE `SHARER_ORDER_COMMISSION_FINDER` ( CREATE TABLE `SHARER_ORDER_COMMISSION_FINDER` (
`id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', `id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
`sharer_order_id` bigint(32) unsigned NOT NULL COMMENT '佣金单ID', `sharer_order_id` bigint(32) unsigned NOT NULL COMMENT '佣金单ID',
...@@ -148,7 +154,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION_FINDER` ( ...@@ -148,7 +154,7 @@ CREATE TABLE `SHARER_ORDER_COMMISSION_FINDER` (
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单分佣视频号达人表'; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单分佣视频号达人表';
DROP TABLE `SHARER_ORDER_BUYER`;
CREATE TABLE `SHARER_ORDER_BUYER` ( CREATE TABLE `SHARER_ORDER_BUYER` (
`id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', `id` bigint(32) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
`sharer_order_id` bigint(32) unsigned NOT NULL COMMENT '佣金单ID', `sharer_order_id` bigint(32) unsigned NOT NULL COMMENT '佣金单ID',
...@@ -159,5 +165,3 @@ CREATE TABLE `SHARER_ORDER_BUYER` ( ...@@ -159,5 +165,3 @@ CREATE TABLE `SHARER_ORDER_BUYER` (
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `idx_sharer_order_id` (`sharer_order_id`) KEY `idx_sharer_order_id` (`sharer_order_id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单买家表'; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='推客佣金单买家表';
\ No newline at end of file
...@@ -62,7 +62,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService { ...@@ -62,7 +62,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
SharerOrder sharerOrder = sharerOrderMapper.selectOne(orderLqw); SharerOrder sharerOrder = sharerOrderMapper.selectOne(orderLqw);
long maxTimeStamp = 0L; long maxTimeStamp = 0L;
if (null != sharerOrder && null != sharerOrder.getOrderUpdateTime()) { if (null != sharerOrder && null != sharerOrder.getOrderUpdateTime()) {
maxTimeStamp = Math.max(maxTimeStamp, sharerOrder.getOrderUpdateTime().getTime() / 1000); maxTimeStamp = Math.max(maxTimeStamp, sharerOrder.getOrderUpdateTime());
} }
return maxTimeStamp; return maxTimeStamp;
} }
...@@ -218,8 +218,8 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService { ...@@ -218,8 +218,8 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
log.error("[op:doSaveCommissionOrder] 分佣单状态转换异常", e); log.error("[op:doSaveCommissionOrder] 分佣单状态转换异常", e);
} }
sharerOrder.setOrderStatus(null != orderStatus ? String.valueOf(orderStatus) : ""); sharerOrder.setOrderStatus(null != orderStatus ? String.valueOf(orderStatus) : "");
sharerOrder.setOrderCreateTime(getDate(detailVO.getCreate_time())); sharerOrder.setOrderCreateTime(detailVO.getCreate_time());
sharerOrder.setOrderUpdateTime(getDate(detailVO.getUpdate_time())); sharerOrder.setOrderUpdateTime(detailVO.getUpdate_time());
Date date = new Date(); Date date = new Date();
sharerOrder.setUpdateTime(date); sharerOrder.setUpdateTime(date);
if(null == sharerOrder.getId() || sharerOrder.getId() <= 0){ if(null == sharerOrder.getId() || sharerOrder.getId() <= 0){
...@@ -286,7 +286,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService { ...@@ -286,7 +286,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
commissionInfoPO.setSharerOrderId(sharerOrderId); commissionInfoPO.setSharerOrderId(sharerOrderId);
commissionInfoPO.setServiceRatio(commissionInfo.getService_ratio()); commissionInfoPO.setServiceRatio(commissionInfo.getService_ratio());
commissionInfoPO.setServiceAmount(commissionInfo.getService_amount()); commissionInfoPO.setServiceAmount(commissionInfo.getService_amount());
commissionInfoPO.setProfitShardingSucTime(getDate(commissionInfo.getProfit_sharding_suc_time())); commissionInfoPO.setProfitShardingSucTime(commissionInfo.getProfit_sharding_suc_time());
commissionInfoPO.setPromotionChannel(commissionInfo.getPromotion_channel()); commissionInfoPO.setPromotionChannel(commissionInfo.getPromotion_channel());
commissionInfoPO.setPromotionInfo(JSON.toJSONString(commissionInfo.getPromotion_info())); commissionInfoPO.setPromotionInfo(JSON.toJSONString(commissionInfo.getPromotion_info()));
Date date = new Date(); Date date = new Date();
...@@ -354,7 +354,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService { ...@@ -354,7 +354,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
agencyInfoPO.setNickname(agencyInfo.getNickname()); agencyInfoPO.setNickname(agencyInfo.getNickname());
agencyInfoPO.setRatio(agencyInfo.getRatio()); agencyInfoPO.setRatio(agencyInfo.getRatio());
agencyInfoPO.setAmount(agencyInfo.getAmount()); agencyInfoPO.setAmount(agencyInfo.getAmount());
agencyInfoPO.setProfitShardingSucTime(getDate(agencyInfo.getProfit_sharding_suc_time())); agencyInfoPO.setProfitShardingSucTime(agencyInfo.getProfit_sharding_suc_time());
Date date = new Date(); Date date = new Date();
agencyInfoPO.setCreateTime(date); agencyInfoPO.setCreateTime(date);
agencyInfoPO.setUpdateTime(date); agencyInfoPO.setUpdateTime(date);
...@@ -382,7 +382,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService { ...@@ -382,7 +382,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
agencyInfoPO.setNickname(agencyInfo.getNickname()); agencyInfoPO.setNickname(agencyInfo.getNickname());
agencyInfoPO.setRatio(agencyInfo.getRatio()); agencyInfoPO.setRatio(agencyInfo.getRatio());
agencyInfoPO.setAmount(agencyInfo.getAmount()); agencyInfoPO.setAmount(agencyInfo.getAmount());
agencyInfoPO.setProfitShardingSucTime(getDate(agencyInfo.getProfit_sharding_suc_time())); agencyInfoPO.setProfitShardingSucTime(agencyInfo.getProfit_sharding_suc_time());
Date date = new Date(); Date date = new Date();
agencyInfoPO.setCreateTime(date); agencyInfoPO.setCreateTime(date);
agencyInfoPO.setUpdateTime(date); agencyInfoPO.setUpdateTime(date);
...@@ -466,8 +466,4 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService { ...@@ -466,8 +466,4 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
buyerInfoPO.setUpdateTime(date); buyerInfoPO.setUpdateTime(date);
sharerOrderBuyerMapper.insert(buyerInfoPO); sharerOrderBuyerMapper.insert(buyerInfoPO);
} }
private Date getDate(Long wechatTime) {
return new Date(wechatTime * 1000);
}
} }
...@@ -42,12 +42,12 @@ public class SharerOrder { ...@@ -42,12 +42,12 @@ public class SharerOrder {
/** /**
* 订单创建时间 * 订单创建时间
*/ */
private Date orderCreateTime; private Long orderCreateTime;
/** /**
* 订单更新时间 * 订单更新时间
*/ */
private Date orderUpdateTime; private Long orderUpdateTime;
/** /**
* 创建时间 * 创建时间
......
...@@ -37,7 +37,7 @@ public class SharerOrderCommission { ...@@ -37,7 +37,7 @@ public class SharerOrderCommission {
/** /**
* 服务费结算时间 * 服务费结算时间
*/ */
private Date profitShardingSucTime; private Long profitShardingSucTime;
/** /**
* 0-橱窗带货,1-推客带货 * 0-橱窗带货,1-推客带货
......
...@@ -52,7 +52,7 @@ public class SharerOrderCommissionPromoterAgency { ...@@ -52,7 +52,7 @@ public class SharerOrderCommissionPromoterAgency {
/** /**
* 推客机构服务费结算时间 * 推客机构服务费结算时间
*/ */
private Date profitShardingSucTime; private Long profitShardingSucTime;
/** /**
* 创建时间 * 创建时间
......
...@@ -52,7 +52,7 @@ public class SharerOrderCommissionSubAgency { ...@@ -52,7 +52,7 @@ public class SharerOrderCommissionSubAgency {
/** /**
* 帮卖机构服务费结算时间 * 帮卖机构服务费结算时间
*/ */
private Date profitShardingSucTime; private Long profitShardingSucTime;
/** /**
* 创建时间 * 创建时间
......
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