diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java
index 31002b4c3..5360473e9 100644
--- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java
+++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java
@@ -37,4 +37,8 @@ public class WxMerchantSubsidyVo extends WxMerchantSubsidy {
@io.swagger.annotations.ApiModelProperty(value="持有人手机",name="phone")
private String phone;
+ @io.swagger.annotations.ApiModelProperty(value="0正常1冻结",name="freeze")
+ private Integer freeze;
+
+
}
diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumSettleStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumSettleStatus.java
index 7580b04ec..8f7956ce3 100644
--- a/mallinkService/src/main/java/com/iformall/enums/EnumSettleStatus.java
+++ b/mallinkService/src/main/java/com/iformall/enums/EnumSettleStatus.java
@@ -6,8 +6,8 @@ package com.iformall.enums;
public enum EnumSettleStatus {
//0待确认1未清算结余金额2结算完成
DEF(0, "待确认"),
- NOT_FINISH(1, "未清算结余金额"),
- FINISH(2, "结算完成"),
+ NOT_FINISH(7, "未清算结余金额"),
+ FINISH(3, "结算完成"),
;
public static EnumSettleStatus getEnum(Integer code) {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
index 69d544ac5..304b15f63 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
@@ -827,7 +827,7 @@ public class WxBillAllServiceImpl implements WxBillAllService {
if(bill != null){
cellList.add(bill.getBillName());
- cellList.add(bill.getReceivePay());
+ cellList.add(new BigDecimal(bill.getReceivePay()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP).toString());
}else{
cellList.add("");
cellList.add("");
@@ -836,7 +836,7 @@ public class WxBillAllServiceImpl implements WxBillAllService {
WxBillSettleBill payBill = i>wxBillSettle.getPayBillIds().size()-1?null:wxBillSettle.getPayBillIds().get(i);
if(payBill != null){
cellList.add(payBill.getBillName());
- cellList.add(payBill.getReceivePay());
+ cellList.add(new BigDecimal(payBill.getReceivePay()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP).toString());
}else{
cellList.add("");
cellList.add("");
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 6f57fd549..211b7752a 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
@@ -163,6 +163,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if (record.getFlowParams() == null || record.getFlowParams().size() == 0) {
record.setStatus(EnumSettleStatus.NOT_FINISH.getCode());
+ //选择的账单改为已结清
+
+
}
if (record.getId() == null) {
record.setId(idWorker.nextId());
diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml
index 75650ca77..f9b23b9a6 100644
--- a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml
@@ -93,9 +93,7 @@
and br.`rent_shop_type` = #{rentShopType}
and br.`pay_way` = #{payWay}
and br.`comments` like concat('%',#{comments},'%')
- and br.`receive_date` between #{starttime} and #{endtime}
-
-
+ and br.`receive_date` between #{starttime} and #{endtime}
order by ${sortColumns}
order by id desc
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml
index cf03760ab..be11eb0e0 100644
--- a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml
@@ -139,6 +139,7 @@
+