Kaynağa Gözat

fix

release_toaliyun_real
winter 2 yıl önce
ebeveyn
işleme
0f26019a3f
3 değiştirilmiş dosya ile 5 ekleme ve 2 silme
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java
  3. +1
    -0
      mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java Dosyayı Görüntüle

@@ -212,5 +212,7 @@ public class WxBillRentManage extends TenantEntity {
@TableField(exist = false) @TableField(exist = false)
private List<Long> merchantIds; private List<Long> merchantIds;
@TableField(exist = false)
private Integer hasMerchant;


} }

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java Dosyayı Görüntüle

@@ -384,11 +384,11 @@ public class WxBillRentManageServiceImpl implements WxBillRentManageService {
} }


@Override @Override
public void exportBill(HttpServletRequest request, HttpServletResponse response,
WxBillRentManage wxBillRentManage) {
public void exportBill(HttpServletRequest request, HttpServletResponse response,WxBillRentManage wxBillRentManage) {
WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillRentManage); WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillRentManage);


String billName = wxBillRentManage.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺租金账单" : "多经点位租金账单"; String billName = wxBillRentManage.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺租金账单" : "多经点位租金账单";
wxBillRentManage.setHasMerchant(EnumYesOrNo.YES.getCode());
PageInfo<WxBillRentManage> billRentList = getBillRentManageList(1, 10000, wxBillRentManage, wxPayAccountBill); PageInfo<WxBillRentManage> billRentList = getBillRentManageList(1, 10000, wxBillRentManage, wxPayAccountBill);
List<WxBillRentManage> datalist = new ArrayList<>(); List<WxBillRentManage> datalist = new ArrayList<>();
if (null != billRentList && null != billRentList.getList()) { if (null != billRentList && null != billRentList.getList()) {


+ 1
- 0
mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml Dosyayı Görüntüle

@@ -115,6 +115,7 @@
<if test=" null != starttime and null!=endtime ">and br.`receive_date` between #{starttime} and #{endtime} <if test=" null != starttime and null!=endtime ">and br.`receive_date` between #{starttime} and #{endtime}
</if> </if>
<if test=" null != manageFeeType ">and br.`manage_fee_type` = #{manageFeeType}</if> <if test=" null != manageFeeType ">and br.`manage_fee_type` = #{manageFeeType}</if>
<if test=" null != hasMerchant ">and br.`merchant_id` is not null</if>
<if test=" null != merchantIds "> <if test=" null != merchantIds ">
and br.merchant_id in and br.merchant_id in


Yükleniyor…
İptal
Kaydet