Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
92dea452c5
6 zmienionych plików z 25 dodań i 1 usunięć
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java
  3. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxShopVo.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java
  5. +15
    -0
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
  6. +1
    -1
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

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

@@ -227,6 +227,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));
vo.setRentArea(billAllHelper.getMerchantShopRentArea(m));
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());


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

@@ -26,6 +26,8 @@ public class WxMerchantBillVo implements Serializable {
@Excel(name = "商铺号", width = 20, orderNum = "3") @Excel(name = "商铺号", width = 20, orderNum = "3")
@TableField(exist = false) @TableField(exist = false)
private String shopNumber; private String shopNumber;
@TableField(exist = false)
private String rentArea;


private String needPay; private String needPay;


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxShopVo.java Wyświetl plik

@@ -41,4 +41,8 @@ public class WxShopVo extends WxShop {
@io.swagger.annotations.ApiModelProperty(value="经营业态",name="business") @io.swagger.annotations.ApiModelProperty(value="经营业态",name="business")
@Excel(name="经营业态",width = 20,orderNum = "9") @Excel(name="经营业态",width = 20,orderNum = "9")
private String business; private String business;
@io.swagger.annotations.ApiModelProperty(value="计租面积",name="operationArea")
@Excel(name="计租面积",width = 20,orderNum = "13")
private String operationArea;
} }

+ 2
- 0
mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java Wyświetl plik

@@ -43,6 +43,8 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{
return receive.getShopNumber(); return receive.getShopNumber();
}else if (name.equals("merchantName")) { }else if (name.equals("merchantName")) {
return receive.getMerchantName(); return receive.getMerchantName();
}else if (name.equals("rentArea")) {
return receive.getRentArea();
}else if (name.equals("merchantId")) { }else if (name.equals("merchantId")) {
if (null != merchantMap) { if (null != merchantMap) {
WxMerchant m = merchantMap.get(receive.getMerchantId()); WxMerchant m = merchantMap.get(receive.getMerchantId());


+ 15
- 0
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java Wyświetl plik

@@ -196,6 +196,21 @@ public class WxBillAllHelper {
return null; return null;
} }
public String getMerchantShopRentArea(WxMerchant merchant) {
List<WxShopVo> shopList = wxShopService.findMerchantShopVoList(merchant, merchant.getId());
if (null != shopList && shopList.size() > 0 ) {
BigDecimal rs = new BigDecimal(0);
for (int i = 0 ; i < shopList.size() ; i ++) {
WxShopVo v = shopList.get(i);
if (null != v.getOperationArea()) {
rs = rs.add(new BigDecimal(v.getOperationArea()));
}
}
return rs.toPlainString();
}
return "0";
}
public List<Long> getOwdMerchantIds(WxMerchant wxMerchant,Date starttime, Date enttime) { public List<Long> getOwdMerchantIds(WxMerchant wxMerchant,Date starttime, Date enttime) {
WxAllBill br = new WxAllBill(); WxAllBill br = new WxAllBill();
updateQueryParm(wxMerchant, br,starttime,enttime); updateQueryParm(wxMerchant, br,starttime,enttime);


+ 1
- 1
mallinkService/src/main/resources/mapper/WxShopMapper.xml Wyświetl plik

@@ -650,7 +650,7 @@




<select id="newFindShopVoList" parameterType="java.util.Map" resultType="com.iformall.domain.vo.WxShopVo"> <select id="newFindShopVoList" parameterType="java.util.Map" resultType="com.iformall.domain.vo.WxShopVo">
select id,shop_number shopNumber,img_url imgUrl,addr,building,floor,baidu_poi baiduPoi,manager_phone linkPhone,manager linkPerson
select id,shop_number shopNumber,img_url imgUrl,addr,building,floor,baidu_poi baiduPoi,manager_phone linkPhone,manager linkPerson,operation_area operationArea
from wx_shop from wx_shop
where is_del=0 where is_del=0
<if test=" null != tenantId and '' != tenantId"> <if test=" null != tenantId and '' != tenantId">


Ładowanie…
Anuluj
Zapisz