winter 1 год назад
Родитель
Сommit
0204bae1b5
3 измененных файлов: 5 добавлений и 7 удалений
  1. +2
    -7
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java

+ 2
- 7
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Просмотреть файл

@@ -128,9 +128,6 @@ public class WxAllBillController extends BillBaseController {
private PageInfo<WxMerchantBillVo> getVoPage(WxMerchant wxMerchant,Integer pageNum, Integer pageSize , Integer billStaus) { private PageInfo<WxMerchantBillVo> getVoPage(WxMerchant wxMerchant,Integer pageNum, Integer pageSize , Integer billStaus) {
Date starttime = wxMerchant.getStarttime(); Date starttime = wxMerchant.getStarttime();
Date enttime = wxMerchant.getEndtime(); Date enttime = wxMerchant.getEndtime();
if (null != enttime) {
enttime = DateUtils.getDayEnd(enttime);
}
wxMerchant.setStarttime(null); wxMerchant.setStarttime(null);
wxMerchant.setEndtime(null); wxMerchant.setEndtime(null);
if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) {
@@ -142,6 +139,7 @@ public class WxAllBillController extends BillBaseController {
wxMerchant.setId(-1L); wxMerchant.setId(-1L);
} }
} }
wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode());
PageInfo<WxMerchant> merchantPage = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); PageInfo<WxMerchant> merchantPage = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize);
PageInfo<WxMerchantBillVo> page = new PageInfo<WxMerchantBillVo>(); PageInfo<WxMerchantBillVo> page = new PageInfo<WxMerchantBillVo>();
page.setPageNum(pageNum); page.setPageNum(pageNum);
@@ -209,9 +207,6 @@ public class WxAllBillController extends BillBaseController {
wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.updateTenantInfo(getTenantInfo());
Date starttime = wxMerchant.getStarttime(); Date starttime = wxMerchant.getStarttime();
Date enttime = wxMerchant.getEndtime(); Date enttime = wxMerchant.getEndtime();
if (null != enttime) {
enttime = DateUtils.getDayEnd(enttime);
}
wxMerchant.setStarttime(null); wxMerchant.setStarttime(null);
wxMerchant.setEndtime(null); wxMerchant.setEndtime(null);
WxMerchant m = wxMerchantService.selectById(wxMerchant.getId()); WxMerchant m = wxMerchantService.selectById(wxMerchant.getId());
@@ -222,7 +217,7 @@ public class WxAllBillController extends BillBaseController {
vo.setMerchantId(m.getId()); vo.setMerchantId(m.getId());
vo.setMerchantName(m.getName()); vo.setMerchantName(m.getName());
vo.setShopNumber(billAllHelper.getMerchantShopNumber(m)); vo.setShopNumber(billAllHelper.getMerchantShopNumber(m));
wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode());
if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) {
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays());
} }


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Просмотреть файл

@@ -482,5 +482,7 @@ public class WxMerchant extends TenantEntity {
@TableField(exist = false) @TableField(exist = false)
public Integer toPayMerchant; public Integer toPayMerchant;
@TableField(exist = false)
public Integer isPreview;
} }

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java Просмотреть файл

@@ -100,6 +100,7 @@ public class WxBillAllHelper {
bill.setNeedPayStartDay(getDateBefore(wxMerchant.getNeedPayPreDays())); bill.setNeedPayStartDay(getDateBefore(wxMerchant.getNeedPayPreDays()));
} }
bill.setToPayMerchant(wxMerchant.getToPayMerchant()); bill.setToPayMerchant(wxMerchant.getToPayMerchant());
bill.setIsPreview(wxMerchant.getIsPreview());
} }
public WxBillSum getBillSum(WxMerchant wxMerchant,Date starttime, Date enttime) { public WxBillSum getBillSum(WxMerchant wxMerchant,Date starttime, Date enttime) {


Загрузка…
Отмена
Сохранить