winter 1 год назад
Родитель
Сommit
802fc43ca3
4 измененных файлов: 7 добавлений и 3 удалений
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java

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

@@ -28,8 +28,9 @@ public class WxBillSum implements Serializable {
public String getNoTaxNeedPay() {
if (StringUtils.isNotBlank(taxRate)) {
noTaxNeedPay = new BigDecimal(needPay).multiply(new BigDecimal(taxRate)).setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString();
return noTaxNeedPay;
}
return noTaxNeedPay;
return needPay;
}


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

@@ -78,6 +78,8 @@ public class WxMerchantBillVo implements Serializable {
@TableField(exist = false)
private List<WxBillSum> billSumList;
@TableField(exist = false)
private Date currentTime;
}

+ 2
- 2
mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java Просмотреть файл

@@ -30,7 +30,7 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{
}else if (name.equals("returnPay")) {
return receive.getReturnPay();
}else if (name.equals("currentTime")) {
return DateUtils.date2String(new Date(),DateUtils.DATE_PATTERN);
return DateUtils.date2String(receive.getCurrentTime(),DateUtils.DATE_PATTERN);
}else if (name.equals("owe")) {
return receive.getOwe();
}else if (name.equals("paid")) {
@@ -38,7 +38,7 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{
}else if (name.equals("needPay")) {
return receive.getNeedPay();
}else if (name.equals("needPayChinese")) {
return receive.getNeedPay();
return receive.getNeedPayChinese();
}else if (name.equals("shopNumber")) {
return receive.getShopNumber();
}else if (name.equals("merchantName")) {


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

@@ -336,6 +336,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
bq.setNeedPay(receiveTotal.toPlainString());
bq.setPaid(payTotal.toPlainString());
bq.setOwe(oweTotal.toPlainString());
bq.setCurrentTime(new Date());
PrintVo vo = handleComponentData(bq.getMerchantId(),templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleItemDataHandler, sumlist,merchantMap,feesMap,shopNumber);
if (null != vo) {
voList.add(vo);


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