Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
da4734b500
3 zmienionych plików z 13 dodań i 5 usunięć
  1. +10
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java
  3. +0
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java

+ 10
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Wyświetl plik

@@ -18,6 +18,7 @@ import com.iformall.domain.po.WxBillPayWay;
import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxEnergyFees; import com.iformall.domain.po.WxEnergyFees;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxPayAccountBill;
import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.WxUserDataRule;
import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.vo.WxBillBad; import com.iformall.domain.vo.WxBillBad;
@@ -228,6 +229,8 @@ public class WxAllBillController extends BillBaseController {
vo.setMerchantName(m.getName()); vo.setMerchantName(m.getName());
vo.setShopNumber(billAllHelper.getMerchantShopNumber(m)); vo.setShopNumber(billAllHelper.getMerchantShopNumber(m));
vo.setRentArea(billAllHelper.getMerchantShopRentArea(m)); vo.setRentArea(billAllHelper.getMerchantShopRentArea(m));
vo.setStarttime(starttime);
vo.setEndtime(enttime);
wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); 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());
@@ -271,7 +274,14 @@ public class WxAllBillController extends BillBaseController {
if (null == merchant.getId() || null == merchant.getTemplateId() ||null == merchant.getFeesIdList() || merchant.getFeesIdList().size() <= 0 ) { if (null == merchant.getId() || null == merchant.getTemplateId() ||null == merchant.getFeesIdList() || merchant.getFeesIdList().size() <= 0 ) {
return new ResultData(Result.ERROR,"清选择商户和科目"); return new ResultData(Result.ERROR,"清选择商户和科目");
} }
merchant.updateTenantInfo(getTenantInfo());
WxPayAccountBill ab = wxPayAccountBillService.getByTenantInfo(merchant);
WxMerchantBillVo vo = getMerchantBillVo(merchant); WxMerchantBillVo vo = getMerchantBillVo(merchant);
if (null != ab) {
vo.setMallBankAccount(ab.getBankCardId());
vo.setMallBankAccountName(ab.getBankAccountName());
vo.setMallBankName(ab.getBankName());
}
return new ResultData(wxFinancePrintService.parseTemplateData(merchant.getTenantId(),merchant.getTemplateId(),merchant.getFeesIdList(),vo)); return new ResultData(wxFinancePrintService.parseTemplateData(merchant.getTenantId(),merchant.getTemplateId(),merchant.getFeesIdList(),vo));
} }


+ 3
- 3
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java Wyświetl plik

@@ -93,10 +93,10 @@ public class WxMerchantBillVo implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private Date endtime; private Date endtime;
@TableField(exist = false) @TableField(exist = false)
private Date mallBankAccountName;
private String mallBankAccountName;
@TableField(exist = false) @TableField(exist = false)
private Date mallBankName;
private String mallBankName;
@TableField(exist = false) @TableField(exist = false)
private Date mallBankAccount;
private String mallBankAccount;
} }

+ 0
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java Wyświetl plik

@@ -315,8 +315,6 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
bq.setShopNumber(""); bq.setShopNumber("");
} }
//打哪些科目 //打哪些科目
List<Long> feesId = dataIds; List<Long> feesId = dataIds;
List<PrintVo> voList = new ArrayList<PrintVo>(); List<PrintVo> voList = new ArrayList<PrintVo>();


Ładowanie…
Anuluj
Zapisz