diff --git a/mallinkAdmin/src/main/resources/db/migration/V20220804000001_bill.sql b/mallinkAdmin/src/main/resources/db/migration/V20220804000001_bill.sql
index 901cf5ad9..90e2f1290 100644
--- a/mallinkAdmin/src/main/resources/db/migration/V20220804000001_bill.sql
+++ b/mallinkAdmin/src/main/resources/db/migration/V20220804000001_bill.sql
@@ -1,4 +1,32 @@
-alter table wx_pay_account change column private_cert_path private_cert_pem_path varchar(255);
-alter table wx_pay_account add COLUMN `merchant_key_path` varchar(100) COMMENT '商户key证书路径';
-alter table wx_pay_account add COLUMN `merchant_apiv3_key` varchar(100) COMMENT '商户apiV3Key';
-alter table wx_pay_account add COLUMN `merchant_cert_pem_path` varchar(100) COMMENT '商户证书密钥文件';
\ No newline at end of file
+alter table wx_bill_rent add COLUMN `apply_status` int(1) not null default 0 COMMENT '账单审核状态';
+alter table wx_bill_rent add COLUMN `apply_pay_img` varchar(1000) COMMENT '付款截图';
+alter table wx_bill_rent add COLUMN `apply_update_time` datetime COMMENT '审核更新时间';
+
+alter table wx_bill_rent_deposit add COLUMN `apply_status` int(1) not null default 0 COMMENT '账单审核状态';
+alter table wx_bill_rent_deposit add COLUMN `apply_pay_img` varchar(1000) COMMENT '付款截图';
+alter table wx_bill_rent_deposit add COLUMN `apply_update_time` datetime COMMENT '审核更新时间';
+
+alter table wx_bill_other_deposit add COLUMN `apply_status` int(1) not null default 0 COMMENT '账单审核状态';
+alter table wx_bill_other_deposit add COLUMN `apply_pay_img` varchar(1000) COMMENT '付款截图';
+alter table wx_bill_other_deposit add COLUMN `apply_update_time` datetime COMMENT '审核更新时间';
+
+alter table wx_bill_property_deposit add COLUMN `apply_status` int(1) not null default 0 COMMENT '账单审核状态';
+alter table wx_bill_property_deposit add COLUMN `apply_pay_img` varchar(1000) COMMENT '付款截图';
+alter table wx_bill_property_deposit add COLUMN `apply_update_time` datetime COMMENT '审核更新时间';
+
+alter table wx_bill_property add COLUMN `apply_status` int(1) not null default 0 COMMENT '账单审核状态';
+alter table wx_bill_property add COLUMN `apply_pay_img` varchar(1000) COMMENT '付款截图';
+alter table wx_bill_property add COLUMN `apply_update_time` datetime COMMENT '审核更新时间';
+
+alter table wx_bill_other add COLUMN `apply_status` int(1) not null default 0 COMMENT '账单审核状态';
+alter table wx_bill_other add COLUMN `apply_pay_img` varchar(1000) COMMENT '付款截图';
+alter table wx_bill_other add COLUMN `apply_update_time` datetime COMMENT '审核更新时间';
+
+alter table wx_bill_daily add COLUMN `apply_status` int(1) not null default 0 COMMENT '账单审核状态';
+alter table wx_bill_daily add COLUMN `apply_pay_img` varchar(1000) COMMENT '付款截图';
+alter table wx_bill_daily add COLUMN `apply_update_time` datetime COMMENT '审核更新时间';
+
+
+
+
+
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
index d8f716d96..22a6f191c 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
@@ -63,6 +63,12 @@ public class WxBillDaily extends TenantEntity {
private Long owe;
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status")
private Integer status;
+ @io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus")
+ private Integer applyStatus;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyPayImg")
+ private String applyPayImg;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyUpdateTime")
+ private Date applyUpdateTime;
@io.swagger.annotations.ApiModelProperty(value="删除 是1否0",name="isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java
index 8bb93cd2a..e92804409 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java
@@ -43,6 +43,12 @@ public class WxBillDeposit extends TenantEntity {
private Long owe;
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status")
private Integer status;
+ @io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus")
+ private Integer applyStatus;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyPayImg")
+ private String applyPayImg;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyUpdateTime")
+ private Date applyUpdateTime;
@io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay")
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java
index daddddd8c..477500185 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java
@@ -67,6 +67,12 @@ public class WxBillOther extends TenantEntity {
@Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "9")
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status")
private Integer status;
+ @io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus")
+ private Integer applyStatus;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyPayImg")
+ private String applyPayImg;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyUpdateTime")
+ private Date applyUpdateTime;
@io.swagger.annotations.ApiModelProperty(value="删除 是1否0",name="isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java
index c19072902..7ee27bedb 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java
@@ -62,6 +62,12 @@ public class WxBillOtherDeposit extends TenantEntity {
@Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "8")
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status")
private Integer status;
+ @io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus")
+ private Integer applyStatus;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyPayImg")
+ private String applyPayImg;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyUpdateTime")
+ private Date applyUpdateTime;
@io.swagger.annotations.ApiModelProperty(value = "删除 是1否0", name = "isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId")
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
index 75ff9b01b..aae898c6d 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
@@ -87,6 +87,12 @@ public class WxBillProperty extends TenantEntity {
@Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "8")
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status")
private Integer status;
+ @io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus")
+ private Integer applyStatus;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyPayImg")
+ private String applyPayImg;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyUpdateTime")
+ private Date applyUpdateTime;
@io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel")
private Integer isDel;
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java
index 4722238e5..7692acf0b 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java
@@ -42,6 +42,12 @@ public class WxBillPropertyDeposit extends TenantEntity {
private Long owe;
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status")
private Integer status;
+ @io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus")
+ private Integer applyStatus;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyPayImg")
+ private String applyPayImg;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyUpdateTime")
+ private Date applyUpdateTime;
@io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay")
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
index 60ffc75aa..5f5898d42 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
@@ -83,6 +83,13 @@ public class WxBillRent extends TenantEntity {
@Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "10")
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status")
private Integer status;
+
+ @io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus")
+ private Integer applyStatus;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyPayImg")
+ private String applyPayImg;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyUpdateTime")
+ private Date applyUpdateTime;
@io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel")
private Integer isDel;
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java
index 022e07d92..ec772717e 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java
@@ -48,9 +48,12 @@ public class WxBillSettleBill extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="账单结束时间",name="endtime")
private Date endtime;
- @TableField(exist = false)
- @io.swagger.annotations.ApiModelProperty(value="付款截图",name="payImg")
- private String payImg;
+ @io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus")
+ private Integer applyStatus;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyPayImg")
+ private String applyPayImg;
+ @io.swagger.annotations.ApiModelProperty(value = "付款截图", name = "applyUpdateTime")
+ private Date applyUpdateTime;
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="获取应收还是欠缴 0欠缴 1应收",name="getReceivePayOrOwe")
diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillRentApplyStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillRentApplyStatus.java
new file mode 100644
index 000000000..5b7077321
--- /dev/null
+++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillRentApplyStatus.java
@@ -0,0 +1,39 @@
+package com.iformall.enums;
+
+
+/**
+ * @author gongbiao
+ */
+
+public enum EnumBillRentApplyStatus {
+ NO_APPLY(0,"未提交审核"),
+ APPLYING(1, "审核中"),
+ REJECT(2,"已退回"),
+ PASSED(3, "已通过")
+ ;
+
+ public static EnumBillRentApplyStatus getEnum(Integer code) {
+ for (EnumBillRentApplyStatus value : values()) {
+ if (value.getCode().equals(code)) {
+ return value;
+ }
+ }
+ return null;
+ }
+
+ private Integer code;
+ private String message;
+
+ EnumBillRentApplyStatus(Integer code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+}
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
index d967fdc08..461a957ad 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
@@ -1,5 +1,6 @@
package com.iformall.service.impl;
+import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode;
@@ -169,6 +170,13 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillQueryType.RENT.getCode().equals(bill.getBillType())) {
WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setId(bill.getBillId());
+ if ( null != bill.getApplyStatus()) {
+ wxBillRent.setApplyStatus(bill.getApplyStatus());
+ wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime());
+ }
+ if (!StringUtils.isBlank(bill.getApplyPayImg())) {
+ wxBillRent.setApplyPayImg(bill.getApplyPayImg());
+ }
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){
wxBillRent.setStatus(status);
@@ -188,6 +196,13 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
}else if(EnumBillType.DEPOSIT.getCode().equals(bill.getBillType())) {
WxBillDeposit wxBillRent = new WxBillDeposit();
wxBillRent.setId(bill.getBillId());
+ if ( null != bill.getApplyStatus()) {
+ wxBillRent.setApplyStatus(bill.getApplyStatus());
+ wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime());
+ }
+ if (!StringUtils.isBlank(bill.getApplyPayImg())) {
+ wxBillRent.setApplyPayImg(bill.getApplyPayImg());
+ }
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){
wxBillRent.setStatus(status);
@@ -212,6 +227,13 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit();
wxBillOtherDeposit.setId(bill.getBillId());
+ if ( null != bill.getApplyStatus()) {
+ wxBillOtherDeposit.setApplyStatus(bill.getApplyStatus());
+ wxBillOtherDeposit.setApplyUpdateTime(bill.getApplyUpdateTime());
+ }
+ if (!StringUtils.isBlank(bill.getApplyPayImg())) {
+ wxBillOtherDeposit.setApplyPayImg(bill.getApplyPayImg());
+ }
if(freezeStatus != null) wxBillOtherDeposit.setFreeze(freezeStatus);
if(status != null){
wxBillOtherDeposit.setStatus(status);
@@ -236,6 +258,13 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit();
propertyDeposit.setId(bill.getBillId());
+ if ( null != bill.getApplyStatus()) {
+ propertyDeposit.setApplyStatus(bill.getApplyStatus());
+ propertyDeposit.setApplyUpdateTime(bill.getApplyUpdateTime());
+ }
+ if (!StringUtils.isBlank(bill.getApplyPayImg())) {
+ propertyDeposit.setApplyPayImg(bill.getApplyPayImg());
+ }
if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus);
if(status != null){
propertyDeposit.setStatus(status);
@@ -261,6 +290,13 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
}else if(EnumBillType.PROPERTY.getCode().equals(bill.getBillType())) {
WxBillProperty wxBillRent = new WxBillProperty();
wxBillRent.setId(bill.getBillId());
+ if ( null != bill.getApplyStatus()) {
+ wxBillRent.setApplyStatus(bill.getApplyStatus());
+ wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime());
+ }
+ if (!StringUtils.isBlank(bill.getApplyPayImg())) {
+ wxBillRent.setApplyPayImg(bill.getApplyPayImg());
+ }
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){
wxBillRent.setStatus(status);
@@ -280,6 +316,13 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit();
propertyDeposit.setId(bill.getBillId());
+ if ( null != bill.getApplyStatus()) {
+ propertyDeposit.setApplyStatus(bill.getApplyStatus());
+ propertyDeposit.setApplyUpdateTime(bill.getApplyUpdateTime());
+ }
+ if (!StringUtils.isBlank(bill.getApplyPayImg())) {
+ propertyDeposit.setApplyPayImg(bill.getApplyPayImg());
+ }
if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus);
if(status != null){
propertyDeposit.setStatus(status);
@@ -304,6 +347,13 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
}else if(EnumBillType.ROUTINE.getCode().equals(bill.getBillType())) {
WxBillOther wxBillRent = new WxBillOther();
wxBillRent.setId(bill.getBillId());
+ if ( null != bill.getApplyStatus()) {
+ wxBillRent.setApplyStatus(bill.getApplyStatus());
+ wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime());
+ }
+ if (!StringUtils.isBlank(bill.getApplyPayImg())) {
+ wxBillRent.setApplyPayImg(bill.getApplyPayImg());
+ }
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){
wxBillRent.setStatus(status);
@@ -323,6 +373,13 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
}else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) {
WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit();
wxBillRent.setId(bill.getBillId());
+ if ( null != bill.getApplyStatus()) {
+ wxBillRent.setApplyStatus(bill.getApplyStatus());
+ wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime());
+ }
+ if (!StringUtils.isBlank(bill.getApplyPayImg())) {
+ wxBillRent.setApplyPayImg(bill.getApplyPayImg());
+ }
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){
wxBillRent.setStatus(status);
@@ -355,6 +412,13 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
}else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) {
WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit();
wxBillRent.setId(bill.getBillId());
+ if ( null != bill.getApplyStatus()) {
+ wxBillRent.setApplyStatus(bill.getApplyStatus());
+ wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime());
+ }
+ if (!StringUtils.isBlank(bill.getApplyPayImg())) {
+ wxBillRent.setApplyPayImg(bill.getApplyPayImg());
+ }
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){
wxBillRent.setStatus(status);
@@ -379,6 +443,13 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
}else{
WxBillDaily wxBillDaily = new WxBillDaily();
wxBillDaily.setId(bill.getBillId());
+ if ( null != bill.getApplyStatus()) {
+ wxBillDaily.setApplyStatus(bill.getApplyStatus());
+ wxBillDaily.setApplyUpdateTime(bill.getApplyUpdateTime());
+ }
+ if (!StringUtils.isBlank(bill.getApplyPayImg())) {
+ wxBillDaily.setApplyPayImg(bill.getApplyPayImg());
+ }
if(freezeStatus != null) wxBillDaily.setFreeze(freezeStatus);
if(status != null){
wxBillDaily.setStatus(status);
@@ -398,6 +469,13 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
WxBillOther wxBillRent = new WxBillOther();
wxBillRent.setId(bill.getBillId());
+ if ( null != bill.getApplyStatus()) {
+ wxBillRent.setApplyStatus(bill.getApplyStatus());
+ wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime());
+ }
+ if (!StringUtils.isBlank(bill.getApplyPayImg())) {
+ wxBillRent.setApplyPayImg(bill.getApplyPayImg());
+ }
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){
wxBillRent.setStatus(status);
@@ -417,6 +495,13 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit();
propertyDeposit.setId(bill.getBillId());
+ if ( null != bill.getApplyStatus()) {
+ propertyDeposit.setApplyStatus(bill.getApplyStatus());
+ propertyDeposit.setApplyUpdateTime(bill.getApplyUpdateTime());
+ }
+ if (!StringUtils.isBlank(bill.getApplyPayImg())) {
+ propertyDeposit.setApplyPayImg(bill.getApplyPayImg());
+ }
if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus);
if(status != null){
propertyDeposit.setStatus(status);
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
index 0170eca99..646cefce5 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
@@ -346,6 +346,8 @@ public class WxFlowServiceImpl implements WxFlowService {
WxBillSettleBill settleBill = new WxBillSettleBill();
settleBill.setBillType(billType);
settleBill.setBillId(Long.parseLong(businessId));
+ settleBill.setApplyStatus(EnumBillRentApplyStatus.PASSED.getCode());
+ settleBill.setApplyUpdateTime(new Date());
billList.add(settleBill);
wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.DEF.getCode(),null);
}else if(EnumRentContractAppStatus.APPLYING.getCode().intValue() == applyStatus.intValue()) {
@@ -356,8 +358,10 @@ public class WxFlowServiceImpl implements WxFlowService {
settleBill.setBillId(Long.parseLong(businessId));
if (EnumFlowKey.BILL_FINISH.getCode().equals(flowType)) {
String payImg = (String)getVariableByKey(variables, "payImg");
- settleBill.setPayImg(payImg);
+ settleBill.setApplyPayImg(payImg);
}
+ settleBill.setApplyStatus(EnumBillRentApplyStatus.APPLYING.getCode());
+ settleBill.setApplyUpdateTime(new Date());
billList.add(settleBill);
wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.YES.getCode(),null);
}else if(EnumRentContractAppStatus.SETBACK.getCode().intValue() == applyStatus.intValue() || EnumRentContractAppStatus.REJECT.getCode().intValue() == applyStatus.intValue()) {
@@ -366,6 +370,8 @@ public class WxFlowServiceImpl implements WxFlowService {
WxBillSettleBill settleBill = new WxBillSettleBill();
settleBill.setBillType(billType);
settleBill.setBillId(Long.parseLong(businessId));
+ settleBill.setApplyStatus(EnumBillRentApplyStatus.REJECT.getCode());
+ settleBill.setApplyUpdateTime(new Date());
billList.add(settleBill);
wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.DEF.getCode(),null);
}
diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml
index 70097b56e..2181b2067 100644
--- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml
@@ -13,6 +13,9 @@
+
+
+
@@ -32,7 +35,7 @@
- `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,
+ `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`tenant_id`,`parent_tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`type`,
`rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay
@@ -53,7 +56,8 @@
and `parent_tenant_id` = #{parentTenantId}
and `owe` = #{owe}
- and `status` = #{status}
+ and `status` = #{status}
+ and `apply_status` = #{applyStatus}
and `is_del` = #{isDel}
and `merchant_id` = #{merchantId}
and `user_id` = #{userId}
@@ -81,7 +85,7 @@
select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` ,
case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` merchant_name,
br.`updatetime`,br.`merchant_id`,br.shop_id,br.shop_name,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail,
- br.`starttime`,br.`endtime`,br.`build_way`,br.freeze,br.service_charge_pay
+ br.`starttime`,br.`endtime`,br.`build_way`,br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,
from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id
and br.`freeze` = #{freeze}
@@ -89,6 +93,7 @@
and br.`merchant_id` = #{merchantId}
and m.`name` like concat('%',#{merchantName},'%')
and br.`status` = #{status}
+ and br.`apply_status` = #{applyStatus}
and br.`is_del` = #{isDel}
and br.`type` = #{type}
and br.`rent_shop_type` = #{rentShopType}
diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
index 355b5c385..dc8748891 100644
--- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
@@ -14,6 +14,9 @@
+
+
+
@@ -32,7 +35,7 @@
`id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,
- `expired_day`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,
+ `expired_day`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`rent_shop_type`,`return_price`,`pay_way`,service_charge_pay
@@ -54,6 +57,7 @@
and `expired_day` = #{expiredDay}
and `owe` = #{owe}
and `status` = #{status}
+ and `apply_status` = #{applyStatus}
and `is_del` = #{isDel}
and `need_pay` = #{needPay}
and `merchant_id` = #{merchantId}
@@ -80,6 +84,7 @@