Commit 952026b1 authored by tangf's avatar tangf

添加修改公司消息

parent 3b2c1067
......@@ -21,7 +21,7 @@ public class CompanyMsgDaoImpl extends BaseDaoImpl implements CompanyMsgDao {
table.add(QUERY_LIST, "select m.*,cm.company_id,cm.type " +
"from pd_company_msg cm left join pd_msg m on cm.msg_id = m.id where 1=1 ")
.add("CompanyId", "and cm.company_id = ? ")
.add("companyId", "and cm.company_id = ? ")
.add("type", "and cm.type = ? ");
}
......
......@@ -209,7 +209,7 @@ public class CompanyServiceImpl implements CompanyService {
if (reqVo.getCompanyType() == 1) {
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
ObjectHelper.writeWithFrom(companyBankCardVo, reqVo);
companyBankCardVo.setId(reqVo.getCompanyBankCardId()!=null?reqVo.getCompanyBankCardId():StringHelper.getNewID());
companyBankCardVo.setId(reqVo.getCompanyBankCardId()!= null?reqVo.getCompanyBankCardId():StringHelper.getNewID());
companyBankCardVo.setName(reqVo.getContactName());
companyBankCardVo.setPhone(reqVo.getContactPhone());
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
......
......@@ -128,9 +128,9 @@ public class DataServiceImpl implements DataService {
companyExtendVo.setQrCode(enterpriseVo.getQrcodesrc());
companyExtendVo.setInvitationCode(enterpriseVo.getInvitationCode());
if (null == enterpriseVo.getIsShare()){
companyExtendVo.setDivedeStatus(0);
companyExtendVo.setDivideStatus(0);
}else {
companyExtendVo.setDivedeStatus(Integer.parseInt(enterpriseVo.getIsShare()));
companyExtendVo.setDivideStatus(Integer.parseInt(enterpriseVo.getIsShare()));
}
if (null != tyyCompanyExtendVo ){
companyExtendVo.setWithdrawTotalCash(tyyCompanyExtendVo.getMoney());
......
......@@ -11,7 +11,7 @@ import java.math.BigDecimal;
* @create 2019/5/16 15:35
*/
@TableAnnotation("pd_company_extend")
public class CompanyExtendVo extends BaseVo {
public class CompanyExtendVo{
private String id;
@TableAnnotation("QR_code")
......@@ -39,7 +39,7 @@ public class CompanyExtendVo extends BaseVo {
* 是否分润
*/
@TableAnnotation("divide_status")
private Integer divedeStatus;
private Integer divideStatus;
/**
* 是够可提现
......@@ -63,7 +63,7 @@ public class CompanyExtendVo extends BaseVo {
* 邀请规则
*/
@TableAnnotation("invitation_rule_id")
private String invitateRuleId;
private String invitationRuleId;
@TableAnnotation("invitation_code")
private String invitationCode;
......@@ -130,12 +130,12 @@ public class CompanyExtendVo extends BaseVo {
this.subledgerRuleId = subledgerRuleId;
}
public Integer getDivedeStatus() {
return divedeStatus;
public Integer getDivideStatus() {
return divideStatus;
}
public void setDivedeStatus(Integer divedeStatus) {
this.divedeStatus = divedeStatus;
public void setDivideStatus(Integer divideStatus) {
this.divideStatus = divideStatus;
}
public Double getWithdrawTotalCash() {
......@@ -162,12 +162,12 @@ public class CompanyExtendVo extends BaseVo {
this.invitationStatus = invitationStatus;
}
public String getInvitateRuleId() {
return invitateRuleId;
public String getInvitationRuleId() {
return invitationRuleId;
}
public void setInvitateRuleId(String invitateRuleId) {
this.invitateRuleId = invitateRuleId;
public void setInvitationRuleId(String invitationRuleId) {
this.invitationRuleId = invitationRuleId;
}
public String getInvitationCode() {
......
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