diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 7399f398b..34058ccb2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -633,7 +633,7 @@ public class WxAllBillController extends BillBaseController { if (null == wxMerchant.getId()) { return new ResultData(Result.ERROR,"请选择商户"); } - //wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); + wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setNeedPayPreDays(getNearBillBeforeDays()); List list = billAllHelper.getMerchantBillList(wxMerchant); @@ -674,7 +674,7 @@ public class WxAllBillController extends BillBaseController { } wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); wxMerchant.updateTenantInfo(getTenantInfo()); - //wxMerchant.setToPayMerchant(EnumYesOrNo.YES.getCode()); + wxMerchant.setToPayMerchant(EnumYesOrNo.YES.getCode()); List list = billAllHelper.getMerchantBillList(wxMerchant); if (null != list && list.size() > 0 ) { List merchnatIds = new ArrayList(); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java index 56c4cc4f9..2be653253 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java @@ -151,5 +151,7 @@ public class WxFinanceReceive extends TenantEntity { private Integer finishStatus; @TableField(exist = false) private Long finishId; + @TableField(exist = false) + private Integer hasExtraMoney; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 7eb4fd9b9..72cb7f8b3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -255,7 +255,11 @@ public class WxFinanceServiceImpl implements WxFinanceService { } return sum.getAdvanceList(); }else { + faq.setType(EnumFinanceCashierType.RECEIVE.getCode()); + faq.setReceiveType(EnumFinanceReceiveType.ADVANCE.getCode()); + faq.setStatus(EnumFinanceReceiveStatus.NORMAL.getCode()); faq.setSortColumns(SortField.CreateTime_ASC); + faq.setHasExtraMoney(EnumYesOrNo.YES.getCode()); return wxFinanceReceiveMapper.findList(faq); } @@ -273,6 +277,10 @@ public class WxFinanceServiceImpl implements WxFinanceService { }else { List setoffList = bill.getSetOffDetailList(); for (int j = calcuteDto.getCurrentIndex(); j < calcuteDto.getAdvanceList().size() ; j++) { + owe = new BigDecimal(bill.getOwe()); + if (owe.compareTo(b0) <= 0) { + break; + } WxFinanceReceive advance = calcuteDto.getAdvanceList().get(j); BigDecimal remain = new BigDecimal(advance.getRemain()); if (remain.compareTo(b0) > 0) { diff --git a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml index fa051b108..baac8ec2a 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml @@ -54,6 +54,7 @@ and `is_print` = #{isPrint} and `is_finish` = #{isFinish} and `status` in (1,3) + and receive_money - IFNULL(use_money,'0') > 0 and merchant_id in