Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
xiaohu 1 год назад
Родитель
Сommit
ae545c6e92
7 измененных файлов: 55 добавлений и 16 удалений
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFeesStandardsController.java
  2. +14
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java
  3. +5
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java
  4. +4
    -0
      mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java
  5. +2
    -0
      mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleItemDataHandler.java
  6. +13
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java
  7. +16
    -14
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFeesStandardsController.java Просмотреть файл

@@ -50,6 +50,7 @@ public class WxFeesStandardsController extends BaseController {
}
record.updateTenantInfo(getTenantInfo());
record.setBillType(EnumBillAllType.PROPERTY.getCode());
record.setIsDel(EnumYesOrNo.NO.getCode());
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
PageInfo<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false);
return new ResultData(page);


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

@@ -23,11 +23,23 @@ public class WxBillSum implements Serializable {
private String needPay = "0";
@TableField(exist = false)
private BigDecimal needPayNumber;
@TableField(exist = false)
private String taxNeedPay;
public String getTaxNeedPay() {
if (StringUtils.isNotBlank(taxRate)) {
taxNeedPay = new BigDecimal(needPay).multiply(new BigDecimal(taxRate)).divide(new BigDecimal(100)).setScale(6,BigDecimal.ROUND_HALF_UP).toPlainString();
}else {
taxNeedPay = "";
}
return taxNeedPay;
}
@TableField(exist = false)
private String noTaxNeedPay = "0";
public String getNoTaxNeedPay() {
if (StringUtils.isNotBlank(taxRate)) {
noTaxNeedPay = new BigDecimal(needPay).multiply(new BigDecimal(taxRate)).setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString();
String taxpay = getTaxNeedPay();
if (StringUtils.isNotBlank(taxpay)) {
noTaxNeedPay = new BigDecimal(needPay).subtract(new BigDecimal(taxpay)).setScale(6,BigDecimal.ROUND_HALF_UP).toPlainString();
return noTaxNeedPay;
}
return needPay;


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

@@ -76,6 +76,11 @@ public class WxMerchantBillVo implements Serializable {
@Excel(name = "账单最大日期",format="yyyy-MM-dd", width = 20, orderNum = "8")
private Date maxDate;
@TableField(exist = false)
private String cusName;
@TableField(exist = false)
private String cusPhone;
@TableField(exist = false)
private List<WxBillSum> billSumList;
@TableField(exist = false)


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

@@ -51,6 +51,10 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{
}
}
return "";
}else if (name.equals("cusName")) {
return receive.getCusName();
}else if (name.equals("cusPhone")) {
return receive.getCusPhone();
}
return null;
}


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

@@ -37,6 +37,8 @@ public class PrintMerchantSettleItemDataHandler implements PrintDataParser{
return receive.getNeedPay();
}else if (name.equals("noTaxNeedPay")) {
return receive.getNoTaxNeedPay();
}else if (name.equals("taxNeedPay")) {
return receive.getTaxNeedPay();
}else if (name.equals("paid")) {
return receive.getPaid();
}else if (name.equals("owe")) {


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

@@ -337,6 +337,19 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
bq.setPaid(payTotal.toPlainString());
bq.setOwe(oweTotal.toPlainString());
bq.setCurrentTime(new Date());
if (null != merchantMap && null != bq.getMerchantId()) {
WxMerchant merchant = merchantMap.get(bq.getMerchantId());
if (null != merchant) {
bq.setCusName(merchant.getLinkPerson());
bq.setCusPhone(merchant.getLinkPhone());
}else {
bq.setCusName("");
bq.setCusPhone("");
}
}else {
bq.setCusName("");
bq.setCusPhone("");
}
PrintVo vo = handleComponentData(bq.getMerchantId(),templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleItemDataHandler, sumlist,merchantMap,feesMap,shopNumber);
if (null != vo) {
voList.add(vo);


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

@@ -544,20 +544,22 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxBillDeposit.setReceivePay(needpay);
//wxBillDeposit.setOwe(needpay);
Date date = new Date();
Calendar instance = Calendar.getInstance();
instance.setTime(wxPropertyContract.getRentalStartDate());
instance.add(Calendar.DAY_OF_MONTH, -1);
Date time = instance.getTime();
//账单开始时间
instance.clear();
instance.setTime(time);
instance.add(Calendar.DAY_OF_MONTH, 1);
wxBillDeposit.setStarttime(instance.getTime());
//账单结束时间
instance.clear();
instance.setTime(time);
instance.add(dayType, wxPropertyContract.getLease());
wxBillDeposit.setEndtime(instance.getTime());
// Calendar instance = Calendar.getInstance();
// instance.setTime(wxPropertyContract.getRentalStartDate());
// instance.add(Calendar.DAY_OF_MONTH, -1);
// Date time = instance.getTime();
// //账单开始时间
// instance.clear();
// instance.setTime(time);
// instance.add(Calendar.DAY_OF_MONTH, 1);
// wxBillDeposit.setStarttime(instance.getTime());
wxBillDeposit.setStarttime(record.getFirstBillDateStart());
// //账单结束时间
// instance.clear();
// instance.setTime(time);
// instance.add(dayType, wxPropertyContract.getLease());
// wxBillDeposit.setEndtime(instance.getTime());
wxBillDeposit.setEndtime(record.getFirstBillDateEnd());
wxBillDeposit.setStatus(EnumBillStatus.WAIT_PAY.getCode());
wxBillDeposit.updateTenantInfo(wxPropertyContract);
wxBillDeposit.setMerchantId(record.getMerchantId());


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