Przeglądaj źródła

Merge branch 'release_toaliyun_real' into release_toaliyun_real_offline_activity

release_toaliyun_real
winter 1 rok temu
rodzic
commit
edf82c3bc7
1 zmienionych plików z 7 dodań i 0 usunięć
  1. +7
    -0
      mallinkService/src/main/java/com/iformall/print/data/impl/PrintBillDataHandler.java

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

@@ -4,6 +4,7 @@ import java.util.Map;


import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
import com.iformall.domain.po.WxAllBill; import com.iformall.domain.po.WxAllBill;
import com.iformall.domain.po.WxEnergyFees; import com.iformall.domain.po.WxEnergyFees;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
@@ -58,6 +59,9 @@ public class PrintBillDataHandler implements PrintDataParser{
} }
return ""; return "";
}else if (name.equals("feesName")) { }else if (name.equals("feesName")) {
if (StringUtils.isNotBlank(receive.getEnergyFeesName())) {
return receive.getEnergyFeesName();
}
if (null != feesMap && null != receive.getEnergyFeesId()) { if (null != feesMap && null != receive.getEnergyFeesId()) {
WxEnergyFees f = feesMap.get(receive.getEnergyFeesId()); WxEnergyFees f = feesMap.get(receive.getEnergyFeesId());
if (null != f) { if (null != f) {
@@ -68,6 +72,9 @@ public class PrintBillDataHandler implements PrintDataParser{
}else if (name.equals("billRemark")) { }else if (name.equals("billRemark")) {
return receive.getBillRemark(); return receive.getBillRemark();
}else if (name.equals("shopNumber")) { }else if (name.equals("shopNumber")) {
if (StringUtils.isNotBlank(receive.getShopNumber())) {
return receive.getShopNumber();
}
if (null != shopNumber && null != receive.getMerchantId()) { if (null != shopNumber && null != receive.getMerchantId()) {
String m = shopNumber.get(receive.getMerchantId()); String m = shopNumber.get(receive.getMerchantId());
return m; return m;


Ładowanie…
Anuluj
Zapisz