Commit 28513f11 by Java-聂换换

修改分润明细

parent f534d930
...@@ -3,6 +3,7 @@ package com.thinkgem.jeesite.modules.pay.entity; ...@@ -3,6 +3,7 @@ package com.thinkgem.jeesite.modules.pay.entity;
import com.thinkgem.jeesite.common.baseBean.BaseEntity; import com.thinkgem.jeesite.common.baseBean.BaseEntity;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
public class BenefitEntity extends BaseEntity implements Serializable { public class BenefitEntity extends BaseEntity implements Serializable {
private String userCode; // 用户code private String userCode; // 用户code
...@@ -19,6 +20,7 @@ public class BenefitEntity extends BaseEntity implements Serializable { ...@@ -19,6 +20,7 @@ public class BenefitEntity extends BaseEntity implements Serializable {
private OrderEntity orderEntity; private OrderEntity orderEntity;
private String createDate;
public BenefitEntity() { public BenefitEntity() {
} }
...@@ -115,4 +117,14 @@ public class BenefitEntity extends BaseEntity implements Serializable { ...@@ -115,4 +117,14 @@ public class BenefitEntity extends BaseEntity implements Serializable {
public void setOrderEntity(OrderEntity orderEntity) { public void setOrderEntity(OrderEntity orderEntity) {
this.orderEntity = orderEntity; this.orderEntity = orderEntity;
} }
public String getCreateDate() {
return createDate;
}
public void setCreateDate(String createDate) {
if(createDate!=null && createDate.length() == 21){
createDate = createDate.substring(0,19);
}
this.createDate = createDate;
}
} }
...@@ -122,6 +122,12 @@ public class OrderEntity extends BaseEntity implements Serializable { ...@@ -122,6 +122,12 @@ public class OrderEntity extends BaseEntity implements Serializable {
public String getCreateDate() { public String getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(String createDate) {
if(createDate!=null && createDate.length() == 21){
createDate = createDate.substring(0,19);
}
this.createDate = createDate;
}
public String getPayChannelName() { public String getPayChannelName() {
return payChannelName; return payChannelName;
...@@ -131,11 +137,6 @@ public class OrderEntity extends BaseEntity implements Serializable { ...@@ -131,11 +137,6 @@ public class OrderEntity extends BaseEntity implements Serializable {
this.payChannelName = payChannelName; this.payChannelName = payChannelName;
} }
public void setCreateDate(String createDate) {
if(createDate!=null && createDate.length() == 21){
createDate = createDate.substring(0,19);
}
this.createDate = createDate;
}
} }
...@@ -39,11 +39,11 @@ ...@@ -39,11 +39,11 @@
o.pay_status AS "orderEntity.payStatus", o.pay_status AS "orderEntity.payStatus",
o.pay_type AS "orderEntity.payType", o.pay_type AS "orderEntity.payType",
o.pay_channel AS "orderEntity.payChannel", o.pay_channel AS "orderEntity.payChannel",
o.amount AS "orderEntity.amount",
o.create_date AS "orderEntity.createDate",
o.`subject` AS "orderEntity.subject", o.`subject` AS "orderEntity.subject",
o.amount AS "orderEntity.amount",
sd.label AS "orderEntity.payChannelName", sd.label AS "orderEntity.payChannelName",
yb.amount AS "amount" yb.amount AS "amount",
yb.create_date AS "createDate"
FROM FROM
youka_benefit yb youka_benefit yb
LEFT JOIN `youka_orders` o ON yb.order_code = o.`code` LEFT JOIN `youka_orders` o ON yb.order_code = o.`code`
......
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