diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java index 7b39a0559..992d3e9c4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java @@ -123,14 +123,21 @@ public class WxMerchantController extends BaseController { return wxMerchantService.updateMerchantAdmin(wxMerchant); } - @ApiOperation("更新法人及税务接口") - @PostMapping("updateMerchantCoprAndTax") - public ResultData updateMerchantCoprAndTax(@RequestBody WxMerchant wxMerchant) { - logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAdmin"); + @ApiOperation("更新法人接口") + @PostMapping("updateMerchantCorp") + public ResultData updateMerchantCopr(@RequestBody WxMerchant wxMerchant) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantCorp"); wxMerchant.setTenantId(getTenantId()); - return wxMerchantService.updateMerchantCoprAndTax(wxMerchant); + return wxMerchantService.updateMerchantCorp(wxMerchant); } + @ApiOperation("更新税务接口") + @PostMapping("updateMerchantTax") + public ResultData updateMerchantTax(@RequestBody WxMerchant wxMerchant) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantTax"); + wxMerchant.setTenantId(getTenantId()); + return wxMerchantService.updateMerchantTax(wxMerchant); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index ab87c0f0f..cc49f8376 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -84,6 +84,13 @@ public class WxMerchant implements Serializable { @Transient private List> shoplist; + @Transient + private WxMerchantCorp wxMerchantCorp; + + @Transient + private WxMerchantTax wxMerchantTax; + + /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -124,54 +131,6 @@ public class WxMerchant implements Serializable { @io.swagger.annotations.ApiModelProperty(value="品牌",name="brand") private String brand; - @io.swagger.annotations.ApiModelProperty(value="法人证件类型",name="corpPapersType") - private Integer corpPapersType; - - @io.swagger.annotations.ApiModelProperty(value="法人证件号码",name="corpPapersNumber") - private String corpPapersNumber; - - @io.swagger.annotations.ApiModelProperty(value="法人",name="corpPapersPerson") - private String corpPapersPerson; - - @io.swagger.annotations.ApiModelProperty(value="法人证件正面",name="corpPapersPicFace") - private String corpPapersPicFace; - - @io.swagger.annotations.ApiModelProperty(value="法人证件背面",name="corpPapersPicBack") - private String corpPapersPicBack; - - @io.swagger.annotations.ApiModelProperty(value="法人证件背面",name="taxpayerType") - private Integer taxpayerType; - - @io.swagger.annotations.ApiModelProperty(value="纳税证件类型",name="taxPapersType") - private Integer taxPapersType; - - @io.swagger.annotations.ApiModelProperty(value="纳税证件号码",name="taxPapersNumber") - private String taxPapersNumber; - - @io.swagger.annotations.ApiModelProperty(value="发票类型",name="invoiceType") - private Integer invoiceType; - - @io.swagger.annotations.ApiModelProperty(value="购方名称",name="invoiceBuyer") - private String invoiceBuyer; - - @io.swagger.annotations.ApiModelProperty(value="纳税人识别号",name="taxpayerIdentifyNumber") - private String taxpayerIdentifyNumber; - - @io.swagger.annotations.ApiModelProperty(value="开票地址及电话",name="invoiceAddressPhone") - private String invoiceAddressPhone; - - @io.swagger.annotations.ApiModelProperty(value="开户行及账号",name="bankAccountNumber") - private String bankAccountNumber; - - @io.swagger.annotations.ApiModelProperty(value="开户名",name="bankAccountPerson") - private String bankAccountPerson; - - @io.swagger.annotations.ApiModelProperty(value="开户行",name="bankName") - private String bankName; - - @io.swagger.annotations.ApiModelProperty(value="银行账号",name="bankAccount") - private String bankAccount; - @io.swagger.annotations.ApiModelProperty(value="VIP折扣率1",name="vipDiscountRate1") private Integer vipDiscountRate1; @@ -181,7 +140,6 @@ public class WxMerchant implements Serializable { @io.swagger.annotations.ApiModelProperty(value="VIP折扣率3",name="vipDiscountRate3") private Integer vipDiscountRate3; - public List> getShoplist() { return shoplist; } @@ -378,132 +336,20 @@ public class WxMerchant implements Serializable { this.brand = brand; } - public Integer getCorpPapersType() { - return corpPapersType; - } - - public void setCorpPapersType(Integer corpPapersType) { - this.corpPapersType = corpPapersType; - } - - public String getCorpPapersNumber() { - return corpPapersNumber; - } - - public void setCorpPapersNumber(String corpPapersNumber) { - this.corpPapersNumber = corpPapersNumber; - } - - public String getCorpPapersPerson() { - return corpPapersPerson; - } - - public void setCorpPapersPerson(String corpPapersPerson) { - this.corpPapersPerson = corpPapersPerson; - } - - public String getCorpPapersPicFace() { - return corpPapersPicFace; - } - - public void setCorpPapersPicFace(String corpPapersPicFace) { - this.corpPapersPicFace = corpPapersPicFace; - } - - public String getCorpPapersPicBack() { - return corpPapersPicBack; - } - - public void setCorpPapersPicBack(String corpPapersPicBack) { - this.corpPapersPicBack = corpPapersPicBack; - } - - public Integer getTaxpayerType() { - return taxpayerType; - } - - public void setTaxpayerType(Integer taxpayerType) { - this.taxpayerType = taxpayerType; - } - - public Integer getTaxPapersType() { - return taxPapersType; - } - - public void setTaxPapersType(Integer taxPapersType) { - this.taxPapersType = taxPapersType; - } - - public String getTaxPapersNumber() { - return taxPapersNumber; - } - - public void setTaxPapersNumber(String taxPapersNumber) { - this.taxPapersNumber = taxPapersNumber; - } - - public Integer getInvoiceType() { - return invoiceType; - } - - public void setInvoiceType(Integer invoiceType) { - this.invoiceType = invoiceType; - } - - public String getInvoiceBuyer() { - return invoiceBuyer; - } - - public void setInvoiceBuyer(String invoiceBuyer) { - this.invoiceBuyer = invoiceBuyer; - } - - public String getTaxpayerIdentifyNumber() { - return taxpayerIdentifyNumber; - } - - public void setTaxpayerIdentifyNumber(String taxpayerIdentifyNumber) { - this.taxpayerIdentifyNumber = taxpayerIdentifyNumber; - } - - public String getInvoiceAddressPhone() { - return invoiceAddressPhone; - } - - public void setInvoiceAddressPhone(String invoiceAddressPhone) { - this.invoiceAddressPhone = invoiceAddressPhone; - } - - public String getBankAccountNumber() { - return bankAccountNumber; - } - - public void setBankAccountNumber(String bankAccountNumber) { - this.bankAccountNumber = bankAccountNumber; - } - - public String getBankAccountPerson() { - return bankAccountPerson; - } - - public void setBankAccountPerson(String bankAccountPerson) { - this.bankAccountPerson = bankAccountPerson; - } - - public String getBankName() { - return bankName; + public WxMerchantCorp getWxMerchantCorp() { + return wxMerchantCorp; } - public void setBankName(String bankName) { - this.bankName = bankName; + public void setWxMerchantCorp(WxMerchantCorp wxMerchantCorp) { + this.wxMerchantCorp = wxMerchantCorp; } - public String getBankAccount() { - return bankAccount; + public WxMerchantTax getWxMerchantTax() { + return wxMerchantTax; } - public void setBankAccount(String bankAccount) { - this.bankAccount = bankAccount; + public void setWxMerchantTax(WxMerchantTax wxMerchantTax) { + this.wxMerchantTax = wxMerchantTax; } public Integer getVipDiscountRate1() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java new file mode 100644 index 000000000..cde33f545 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java @@ -0,0 +1,219 @@ +package com.iformall.domain.po; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Table(name = "wx_merchant_corp") +public class WxMerchantCorp implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + /*商户ID**/ + @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") + private Long merchantId; + /*法人证件类型1居民身份证2军官证3学生证4驾驶证6护照**/ + @io.swagger.annotations.ApiModelProperty(value="法人证件类型1居民身份证2军官证3学生证4驾驶证5护照",name="corpPapersType") + private Integer corpPapersType; + /*法人证件号码**/ + @io.swagger.annotations.ApiModelProperty(value="法人证件号码",name="corpPapersNumber") + private String corpPapersNumber; + /*法人**/ + @io.swagger.annotations.ApiModelProperty(value="法人",name="corpPapersPerson") + private String corpPapersPerson; + /*法人证件正面**/ + @io.swagger.annotations.ApiModelProperty(value="法人证件正面",name="corpPapersPicFace") + private String corpPapersPicFace; + /*法人证件背面**/ + @io.swagger.annotations.ApiModelProperty(value="法人证件背面",name="corpPapersPicBack") + private String corpPapersPicBack; + /*注册地址**/ + @io.swagger.annotations.ApiModelProperty(value="注册地址",name="corpPapersAddress") + private String corpPapersAddress; + /*执照注册号**/ + @io.swagger.annotations.ApiModelProperty(value="执照注册号",name="corpPapersRegisterNumber") + private String corpPapersRegisterNumber; + /*执照文件**/ + @io.swagger.annotations.ApiModelProperty(value="执照文件",name="corpPapersFile") + private String corpPapersFile; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getMerchantId() { + return merchantId; + } + public void setMerchantId(Long _merchantId) { + merchantId = _merchantId; + } + public Integer getCorpPapersType() { + return corpPapersType; + } + public void setCorpPapersType(Integer _corpPapersType) { + corpPapersType = _corpPapersType; + } + public String getCorpPapersNumber() { + return corpPapersNumber; + } + public void setCorpPapersNumber(String _corpPapersNumber) { + corpPapersNumber = _corpPapersNumber; + } + public String getCorpPapersPerson() { + return corpPapersPerson; + } + public void setCorpPapersPerson(String _corpPapersPerson) { + corpPapersPerson = _corpPapersPerson; + } + public String getCorpPapersPicFace() { + return corpPapersPicFace; + } + public void setCorpPapersPicFace(String _corpPapersPicFace) { + corpPapersPicFace = _corpPapersPicFace; + } + public String getCorpPapersPicBack() { + return corpPapersPicBack; + } + public void setCorpPapersPicBack(String _corpPapersPicBack) { + corpPapersPicBack = _corpPapersPicBack; + } + public String getCorpPapersAddress() { + return corpPapersAddress; + } + public void setCorpPapersAddress(String _corpPapersAddress) { + corpPapersAddress = _corpPapersAddress; + } + public String getCorpPapersRegisterNumber() { + return corpPapersRegisterNumber; + } + public void setCorpPapersRegisterNumber(String _corpPapersRegisterNumber) { + corpPapersRegisterNumber = _corpPapersRegisterNumber; + } + public String getCorpPapersFile() { + return corpPapersFile; + } + public void setCorpPapersFile(String _corpPapersFile) { + corpPapersFile = _corpPapersFile; + } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") + ,CorpPapersType_ASC("`corpPapersType` ASC"),CorpPapersType_DESC("`corpPapersType` DESC") + ,CorpPapersNumber_ASC("`corpPapersNumber` ASC"),CorpPapersNumber_DESC("`corpPapersNumber` DESC") + ,CorpPapersPerson_ASC("`corpPapersPerson` ASC"),CorpPapersPerson_DESC("`corpPapersPerson` DESC") + ,CorpPapersPicFace_ASC("`corpPapersPicFace` ASC"),CorpPapersPicFace_DESC("`corpPapersPicFace` DESC") + ,CorpPapersPicBack_ASC("`corpPapersPicBack` ASC"),CorpPapersPicBack_DESC("`corpPapersPicBack` DESC") + ,CorpPapersAddress_ASC("`corpPapersAddress` ASC"),CorpPapersAddress_DESC("`corpPapersAddress` DESC") + ,CorpPapersRegisterNumber_ASC("`corpPapersRegisterNumber` ASC"),CorpPapersRegisterNumber_DESC("`corpPapersRegisterNumber` DESC") + ,CorpPapersFile_ASC("`corpPapersFile` ASC"),CorpPapersFile_DESC("`corpPapersFile` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java new file mode 100644 index 000000000..24bc84865 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java @@ -0,0 +1,249 @@ +package com.iformall.domain.po; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Table(name = "wx_merchant_tax") +public class WxMerchantTax implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + /*商户ID**/ + @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") + private Long merchantId; + /*纳税人类型1一般纳税人2小规模纳税人**/ + @io.swagger.annotations.ApiModelProperty(value="纳税人类型1一般纳税人2小规模纳税人",name="taxpayerType") + private Integer taxpayerType; + /*纳税证件类型1企业登记证2营业执照3组织机构代码证4税务登记证5银行开户许可证**/ + @io.swagger.annotations.ApiModelProperty(value="纳税证件类型1企业登记证2营业执照3组织机构代码证4税务登记证5银行开户许可证",name="taxPapersType") + private Integer taxPapersType; + /*纳税证件号码**/ + @io.swagger.annotations.ApiModelProperty(value="纳税证件号码",name="taxPapersNumber") + private String taxPapersNumber; + /*发票类型1增值税专用发票2普通发票3定额发票**/ + @io.swagger.annotations.ApiModelProperty(value="发票类型1增值税专用发票2普通发票3定额发票",name="invoiceType") + private Integer invoiceType; + /*购方名称**/ + @io.swagger.annotations.ApiModelProperty(value="购方名称",name="invoiceBuyer") + private String invoiceBuyer; + /*纳税人识别号**/ + @io.swagger.annotations.ApiModelProperty(value="纳税人识别号",name="taxpayerIdentifyNumber") + private String taxpayerIdentifyNumber; + /*开票地址及电话**/ + @io.swagger.annotations.ApiModelProperty(value="开票地址及电话",name="invoiceAddressPhone") + private String invoiceAddressPhone; + /*开户行及账号**/ + @io.swagger.annotations.ApiModelProperty(value="开户行及账号",name="bankAccountNumber") + private String bankAccountNumber; + /*开户名**/ + @io.swagger.annotations.ApiModelProperty(value="开户名",name="bankAccountPerson") + private String bankAccountPerson; + /*银行名称**/ + @io.swagger.annotations.ApiModelProperty(value="银行名称",name="bankName") + private String bankName; + /*银行账号**/ + @io.swagger.annotations.ApiModelProperty(value="银行账号",name="bankAccount") + private String bankAccount; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getMerchantId() { + return merchantId; + } + public void setMerchantId(Long _merchantId) { + merchantId = _merchantId; + } + public Integer getTaxpayerType() { + return taxpayerType; + } + public void setTaxpayerType(Integer _taxpayerType) { + taxpayerType = _taxpayerType; + } + public Integer getTaxPapersType() { + return taxPapersType; + } + public void setTaxPapersType(Integer _taxPapersType) { + taxPapersType = _taxPapersType; + } + public String getTaxPapersNumber() { + return taxPapersNumber; + } + public void setTaxPapersNumber(String _taxPapersNumber) { + taxPapersNumber = _taxPapersNumber; + } + public Integer getInvoiceType() { + return invoiceType; + } + public void setInvoiceType(Integer _invoiceType) { + invoiceType = _invoiceType; + } + public String getInvoiceBuyer() { + return invoiceBuyer; + } + public void setInvoiceBuyer(String _invoiceBuyer) { + invoiceBuyer = _invoiceBuyer; + } + public String getTaxpayerIdentifyNumber() { + return taxpayerIdentifyNumber; + } + public void setTaxpayerIdentifyNumber(String _taxpayerIdentifyNumber) { + taxpayerIdentifyNumber = _taxpayerIdentifyNumber; + } + public String getInvoiceAddressPhone() { + return invoiceAddressPhone; + } + public void setInvoiceAddressPhone(String _invoiceAddressPhone) { + invoiceAddressPhone = _invoiceAddressPhone; + } + public String getBankAccountNumber() { + return bankAccountNumber; + } + public void setBankAccountNumber(String _bankAccountNumber) { + bankAccountNumber = _bankAccountNumber; + } + public String getBankAccountPerson() { + return bankAccountPerson; + } + public void setBankAccountPerson(String _bankAccountPerson) { + bankAccountPerson = _bankAccountPerson; + } + public String getBankName() { + return bankName; + } + public void setBankName(String _bankName) { + bankName = _bankName; + } + public String getBankAccount() { + return bankAccount; + } + public void setBankAccount(String _bankAccount) { + bankAccount = _bankAccount; + } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") + ,TaxpayerType_ASC("`taxpayerType` ASC"),TaxpayerType_DESC("`taxpayerType` DESC") + ,TaxPapersType_ASC("`taxPapersType` ASC"),TaxPapersType_DESC("`taxPapersType` DESC") + ,TaxPapersNumber_ASC("`taxPapersNumber` ASC"),TaxPapersNumber_DESC("`taxPapersNumber` DESC") + ,InvoiceType_ASC("`invoiceType` ASC"),InvoiceType_DESC("`invoiceType` DESC") + ,InvoiceBuyer_ASC("`invoiceBuyer` ASC"),InvoiceBuyer_DESC("`invoiceBuyer` DESC") + ,TaxpayerIdentifyNumber_ASC("`taxpayerIdentifyNumber` ASC"),TaxpayerIdentifyNumber_DESC("`taxpayerIdentifyNumber` DESC") + ,InvoiceAddressPhone_ASC("`invoiceAddressPhone` ASC"),InvoiceAddressPhone_DESC("`invoiceAddressPhone` DESC") + ,BankAccountNumber_ASC("`bankAccountNumber` ASC"),BankAccountNumber_DESC("`bankAccountNumber` DESC") + ,BankAccountPerson_ASC("`bankAccountPerson` ASC"),BankAccountPerson_DESC("`bankAccountPerson` DESC") + ,BankName_ASC("`bankName` ASC"),BankName_DESC("`bankName` DESC") + ,BankAccount_ASC("`bankAccount` ASC"),BankAccount_DESC("`bankAccount` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantCorpMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantCorpMapper.java new file mode 100644 index 000000000..cd79bd515 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantCorpMapper.java @@ -0,0 +1,18 @@ +package com.iformall.mapper; + + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxMerchantCorp; + +import java.util.List; + +public interface WxMerchantCorpMapper extends CommonMapper { + + List findList(WxMerchantCorp wxMerchantCorp); + + + + + + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTaxMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTaxMapper.java new file mode 100644 index 000000000..ff60dac34 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTaxMapper.java @@ -0,0 +1,18 @@ +package com.iformall.mapper; + + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxMerchantTax; + +import java.util.List; + +public interface WxMerchantTaxMapper extends CommonMapper { + + List findList(WxMerchantTax wxMerchantTax); + + + + + + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 7bb6a7df7..b51a487a4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -55,6 +55,8 @@ public interface WxMerchantService { ResultData updateMerchantAdmin(WxMerchant wxMerchant); - ResultData updateMerchantCoprAndTax(WxMerchant wxMerchant); + ResultData updateMerchantCorp(WxMerchant wxMerchant); + + ResultData updateMerchantTax(WxMerchant wxMerchant); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index bc0438e2e..7897e4234 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -66,6 +66,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Autowired WxBillDepositMapper wxBillDepositMapper; + @Autowired + WxMerchantCorpMapper wxMerchantCorpMapper; + + @Autowired + WxMerchantTaxMapper wxMerchantTaxMapper; + @Override public PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { @@ -135,6 +141,23 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchant.setAccountTypeValue(receiver.getReceiverType()); } + WxMerchantCorp wxMerchantCorp = new WxMerchantCorp(); + wxMerchantCorp.setMerchantId(wxMerchant.getId()); + List corps = wxMerchantCorpMapper.findList(wxMerchantCorp); + if(!corps.isEmpty()){ + wxMerchant.setWxMerchantCorp(corps.get(0)); + }else{ + wxMerchant.setWxMerchantCorp(new WxMerchantCorp()); + } + + WxMerchantTax wxMerchantTax = new WxMerchantTax(); + wxMerchantCorp.setMerchantId(wxMerchant.getId()); + List taxes = wxMerchantTaxMapper.findList(wxMerchantTax); + if(!taxes.isEmpty()){ + wxMerchant.setWxMerchantTax(taxes.get(0)); + }else{ + wxMerchant.setWxMerchantTax(new WxMerchantTax()); + } return wxMerchant; } @@ -367,34 +390,66 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override - public ResultData updateMerchantCoprAndTax(WxMerchant wxMerchant) { + public ResultData updateMerchantCorp(WxMerchant wxMerchant) { try { if (wxMerchant.getId() == null) { return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); } - WxMerchant merchant = wxMerchantMapper.selectByPrimaryKey(wxMerchant.getId()); - merchant.setCorpPapersType(wxMerchant.getCorpPapersType()); - merchant.setCorpPapersNumber(wxMerchant.getCorpPapersNumber()); - merchant.setCorpPapersPerson(wxMerchant.getCorpPapersPerson()); - merchant.setCorpPapersPicFace(wxMerchant.getCorpPapersPicFace()); - merchant.setCorpPapersPicBack(wxMerchant.getCorpPapersPicBack()); - merchant.setTaxpayerType(wxMerchant.getTaxpayerType()); - merchant.setTaxPapersType(wxMerchant.getTaxPapersType()); - merchant.setTaxPapersNumber(wxMerchant.getTaxPapersNumber()); - merchant.setInvoiceType(wxMerchant.getInvoiceType()); - merchant.setInvoiceBuyer(wxMerchant.getInvoiceBuyer()); - merchant.setTaxpayerIdentifyNumber(wxMerchant.getTaxpayerIdentifyNumber()); - merchant.setInvoiceAddressPhone(wxMerchant.getInvoiceAddressPhone()); - merchant.setBankAccountNumber(wxMerchant.getBankAccountNumber()); - merchant.setBankAccountPerson(wxMerchant.getBankAccountPerson()); - merchant.setBankName(wxMerchant.getBankName()); - merchant.setBankAccount(wxMerchant.getBankAccount()); - //更新商户 - Date date = new Date(); - merchant.setUpdateDate(date); - wxMerchantMapper.updateByPrimaryKeySelective(merchant); + WxMerchantCorp wxMerchantCorp = new WxMerchantCorp(); + wxMerchantCorp.setMerchantId(wxMerchant.getId()); + List list = wxMerchantCorpMapper.findList(wxMerchantCorp); + if(list.isEmpty()){ + final IdWorker idWorker = IdWorker.get(); + WxMerchantCorp record = wxMerchant.getWxMerchantCorp(); + record.setId(idWorker.nextId()); + record.setTenantId(wxMerchant.getTenantId()); + record.setMerchantId(wxMerchant.getId()); + Date date = new Date(); + record.setCreateDate(date); + record.setUpdateDate(date); + wxMerchantCorpMapper.insertSelective(record); + }else{ + WxMerchantCorp record = wxMerchant.getWxMerchantCorp(); + Date date = new Date(); + record.setUpdateDate(date); + wxMerchantCorpMapper.updateByPrimaryKeySelective(record); + } + } catch (Exception e) { + logger.error("db failed: 操作法人信息失败, e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); + } + return new ResultData(Result.SUCCESS, "操作成功"); + + } + + @Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) + @Override + public ResultData updateMerchantTax(WxMerchant wxMerchant) { + try { + if (wxMerchant.getId() == null) { + return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); + } + WxMerchantTax wxMerchantTax = new WxMerchantTax(); + wxMerchantTax.setMerchantId(wxMerchant.getId()); + List list = wxMerchantTaxMapper.findList(wxMerchantTax); + if(list.isEmpty()){ + final IdWorker idWorker = IdWorker.get(); + WxMerchantTax record = wxMerchant.getWxMerchantTax(); + record.setId(idWorker.nextId()); + record.setTenantId(wxMerchant.getTenantId()); + record.setMerchantId(wxMerchant.getId()); + Date date = new Date(); + record.setCreateDate(date); + record.setUpdateDate(date); + wxMerchantTaxMapper.insertSelective(record); + }else{ + WxMerchantTax record = wxMerchant.getWxMerchantTax(); + Date date = new Date(); + record.setUpdateDate(date); + wxMerchantTaxMapper.updateByPrimaryKeySelective(record); + } } catch (Exception e) { - logger.error("db failed: 更新法人及税务信息失败, e:" + e.getMessage()); + logger.error("db failed: 操作税务信息失败, e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } return new ResultData(Result.SUCCESS, "操作成功"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 1538b9abb..54ad14238 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -678,14 +678,18 @@ public class WxRentContractServiceImpl implements WxRentContractService { result.put("buildArea", wxShop.get("buildArea")); result.put("operationArea", wxShop.get("operationArea")); //商户信息 - WxMerchant merchant = wxMerchantMapper.selectByPrimaryKey(wxRentContract.getMerchantId()); - result.put("corpPapersNumber", merchant.getCorpPapersNumber()!=null?merchant.getCorpPapersNumber():" "); - result.put("corpPapersType", merchant.getCorpPapersType()!=null?EnumPapersType.getEnum(merchant.getCorpPapersType()).getMessage():" "); - result.put("corpPapersPerson", merchant.getCorpPapersPerson()!=null?merchant.getCorpPapersPerson():" "); - result.put("taxPapersType", merchant.getTaxPapersType()!=null?EnumTaxpayerType.getEnum(merchant.getTaxPapersType()).getMessage():" "); - result.put("bankName", merchant.getBankName()!=null?merchant.getBankName():" "); - result.put("bankAccount", merchant.getBankAccount()!=null?merchant.getBankAccount():" "); - result.put("invoiceAddressPhone", merchant.getInvoiceAddressPhone()!=null?merchant.getInvoiceAddressPhone():" "); + WxMerchant merchant = wxMerchantService.getById(wxRentContract.getMerchantId()); + //法人信息 + WxMerchantCorp wxMerchantCorp = merchant.getWxMerchantCorp(); + result.put("corpPapersNumber", wxMerchantCorp.getCorpPapersNumber()!=null?wxMerchantCorp.getCorpPapersNumber():" "); + result.put("corpPapersType", wxMerchantCorp.getCorpPapersType()!=null?EnumPapersType.getEnum(wxMerchantCorp.getCorpPapersType()).getMessage():" "); + result.put("corpPapersPerson", wxMerchantCorp.getCorpPapersPerson()!=null?wxMerchantCorp.getCorpPapersPerson():" "); + //税务信息 + WxMerchantTax wxMerchantTax = merchant.getWxMerchantTax(); + result.put("taxPapersType", wxMerchantTax.getTaxPapersType()!=null?EnumTaxpayerType.getEnum(wxMerchantTax.getTaxPapersType()).getMessage():" "); + result.put("bankName", wxMerchantTax.getBankName()!=null?wxMerchantTax.getBankName():" "); + result.put("bankAccount", wxMerchantTax.getBankAccount()!=null?wxMerchantTax.getBankAccount():" "); + result.put("invoiceAddressPhone", wxMerchantTax.getInvoiceAddressPhone()!=null?wxMerchantTax.getInvoiceAddressPhone():" "); //租赁合同信息 String rentalStartDate = DateUtils.date2String(wxRentContract.getRentalStartDate(), "yyyy-MM-dd"); result.put("rentalStartDate", rentalStartDate); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantCorpMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantCorpMapper.xml new file mode 100644 index 000000000..a0e3d9bca --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxMerchantCorpMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`merchant_id`,`corp_papers_type`,`corp_papers_number`,`corp_papers_person`,`corp_papers_pic_face`,`corp_papers_pic_back`,`corp_papers_address`,`corp_papers_register_number`,`corp_papers_file`,`create_date`,`update_date` + + + + where 1 = 1 + and `id` = #{id} + and `tenant_id` = #{tenantId} + and `merchant_id` = #{merchantId} + and `corp_papers_type` = #{corpPapersType} + and `corp_papers_number` = #{corpPapersNumber} + and `corp_papers_person` = #{corpPapersPerson} + and `corp_papers_pic_face` = #{corpPapersPicFace} + and `corp_papers_pic_back` = #{corpPapersPicBack} + and `corp_papers_address` = #{corpPapersAddress} + and `corp_papers_register_number` = #{corpPapersRegisterNumber} + and `corp_papers_file` = #{corpPapersFile} + and `create_date` = #{createDate} + and `update_date` = #{updateDate} + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index e0afbaba3..904e472fa 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -16,22 +16,6 @@ - - - - - - - - - - - - - - - - @@ -41,10 +25,7 @@ `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, - `business_id`,`shop_type`,`brand`,`corp_papers_type`,`corp_papers_number`,`corp_papers_person`,`corp_papers_pic_face`, - `corp_papers_pic_back`,`taxpayer_type`,`tax_papers_type`,`tax_papers_number`,`invoice_type`,`invoice_buyer`, - `taxpayer_identify_number``invoice_address_phone`,`bank_account_number`,`bank_account_person`,`bank_name`,`bank_account`, - `vip_discount_rate1`,`vip_discount_rate2`,`vip_discount_rate3` + `business_id`,`shop_type`,`brand`,`vip_discount_rate1`,`vip_discount_rate2`,`vip_discount_rate3` diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTaxMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTaxMapper.xml new file mode 100644 index 000000000..ff4cbcf1b --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxMerchantTaxMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`merchant_id`,`taxpayer_type`,`tax_papers_type`,`tax_papers_number`,`invoice_type`,`invoice_buyer`,`taxpayer_identify_number`,`invoice_address_phone`,`bank_account_number`,`bank_account_person`,`bank_name`,`bank_account`,`create_date`,`update_date` + + + + where 1 = 1 + and `id` = #{id} + and `tenant_id` = #{tenantId} + and `merchant_id` = #{merchantId} + and `taxpayer_type` = #{taxpayerType} + and `tax_papers_type` = #{taxPapersType} + and `tax_papers_number` = #{taxPapersNumber} + and `invoice_type` = #{invoiceType} + and `invoice_buyer` = #{invoiceBuyer} + and `taxpayer_identify_number` = #{taxpayerIdentifyNumber} + and `invoice_address_phone` = #{invoiceAddressPhone} + and `bank_account_number` = #{bankAccountNumber} + and `bank_account_person` = #{bankAccountPerson} + and `bank_name` = #{bankName} + and `bank_account` = #{bankAccount} + and `create_date` = #{createDate} + and `update_date` = #{updateDate} + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + +