Browse Source

[日常费用账单][修改[导入模板模板]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
aee1e81a46
6 changed files with 41 additions and 49 deletions
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java
  3. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java
  4. +4
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
  5. +0
    -12
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java
  6. +32
    -28
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java View File

@@ -56,9 +56,9 @@ public class BillDailyAsyncTask {
public void importExcelData(File file, MallUserInfo user, String importKey, String tenantId) {
ImportParams params = new ImportParams();
// 需要验证
params.setImportFields(new String[]{"商铺号", "费用类型", "实际应收金额", "实收金额", "欠缴金额", "截止收款日期", "逾期天数"});
params.setImportFields(new String[]{"商铺号", "费用类型", "实际应收金额", "实收金额", "截止收款日期", "逾期天数"});
IExcelDataHandler<WxBillDailyVo> handler = new BillDailyAsyncTask.BillDailyExcelHandler();
handler.setNeedHandlerFields(new String[]{"商铺号", "费用类型", "实际应收金额", "实收金额", "欠缴金额", "截止收款日期", "逾期天数"});
handler.setNeedHandlerFields(new String[]{"商铺号", "费用类型", "实际应收金额", "实收金额", "截止收款日期", "逾期天数"});
params.setNeedVerify(true);

ExcelImportResult<WxBillDailyVo> datalist = null;


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java View File

@@ -119,7 +119,7 @@ public class WxBillDailyController extends BaseController {
@PostMapping(value = "/importTemplate", consumes = "multipart/*")
@SystemControllerLog(description = "会员管理-导入数据")
public ResultData importTemplate(@RequestParam("file") MultipartFile mFile) {
logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::importTemplate");
logger.debug("[" + getIpAddr() + "] wxBillDailyService::importTemplate");
if (mFile.isEmpty()) {
throw new MallinkException(Result.ERROR, "上传文件不能为空");
}


+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java View File

@@ -16,7 +16,8 @@ public class UrlCheck {
|| url.contains("/wxCUserBasicInfo/listByFilter")
|| url.contains("wxMsgCallback")
|| url.contains("notify")
|| url.contains("pvlog");
|| url.contains("pvlog")
|| url.contains("/wxBillDaily/importTemplate");
}

}

+ 4
- 5
mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java View File

@@ -1,12 +1,11 @@
package com.iformall.domain.po;

import cn.afterturn.easypoi.excel.annotation.Excel;
import com.iformall.common.SortColumn;

import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;

import cn.afterturn.easypoi.excel.annotation.Excel;

import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.Date;
@@ -74,7 +73,7 @@ public class WxBillDaily extends BaseEntity{
@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay")
private Long pay;

@Excel(name = "截止收款日期", orderNum = "6", width = 20, format = "yyyy-MM-dd")
@Excel(name = "截止收款日期", orderNum = "5", width = 20, format = "yyyy-MM-dd")
@NotNull
@io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate")
@SortColumn(column = "receiveDate")
@@ -87,7 +86,7 @@ public class WxBillDaily extends BaseEntity{
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime")
private Date createtime;

@Excel(name = "逾期天数", orderNum = "7", width = 20, numFormat = "#")
@Excel(name = "逾期天数", orderNum = "6", width = 20, numFormat = "#")
@NotNull
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")
@SortColumn(column = "expiredDay")


+ 0
- 12
mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java View File

@@ -26,11 +26,6 @@ public class WxBillDailyVo extends WxBillDaily {
@io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "payStr")
private String payStr;

@Excel(name = "欠缴金额", orderNum = "5", width = 20, numFormat = "#.##")
@NotNull
@io.swagger.annotations.ApiModelProperty(value = "欠缴金额", name = "oweStr")
private String oweStr;

public String getShopNumber() {
return shopNumber;
}
@@ -55,11 +50,4 @@ public class WxBillDailyVo extends WxBillDaily {
this.payStr = payStr;
}

public String getOweStr() {
return oweStr;
}

public void setOweStr(String oweStr) {
this.oweStr = oweStr;
}
}

+ 32
- 28
mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java View File

@@ -224,7 +224,6 @@ public class WxBillDailyServiceImpl implements WxBillDailyService {
v1.setType(1);
v1.setReceivePayStr("1");
v1.setPayStr("0");
v1.setOweStr("0");
v1.setReceiveDate(new Date());
v1.setExpiredDay(0L);
list.add(v1);
@@ -233,7 +232,6 @@ public class WxBillDailyServiceImpl implements WxBillDailyService {
v2.setType(2);
v2.setReceivePayStr("1000");
v2.setPayStr("0");
v2.setOweStr("1000");
v2.setReceiveDate(new Date());
v2.setExpiredDay(0L);
list.add(v2);
@@ -263,7 +261,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService {
return;
}
Integer type = billDaily.getType();
if (type != null) {
if (type == null) {
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1);
logger.error("账单类型为空", billDaily.toString());
return;
@@ -292,51 +290,57 @@ public class WxBillDailyServiceImpl implements WxBillDailyService {
logger.error("实收金额小于0", billDaily.toString());
return;
}
String oweStr = billDaily.getOweStr();
if (StringUtils.isBlank(oweStr)) {
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1);
logger.error("欠缴金额为空", billDaily.toString());
return;
}
double oweD = new BigDecimal(oweStr).doubleValue();
if (oweD < 0) {

if (receivePayD < payD) {
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1);
logger.error("欠缴金额小于0", billDaily.toString());
logger.error("实际应收金额小于实收金额", billDaily.toString());
return;
}
long owe = new BigDecimal(oweD).multiply(new BigDecimal(100)).longValue();
billDaily.setOwe(owe);

WxBillDaily wxBillDaily = new WxBillDaily();

long receivePay = new BigDecimal(receivePayD).multiply(new BigDecimal(100)).longValue();
wxBillDaily.setReceivePay(receivePay);

long pay = new BigDecimal(payD).multiply(new BigDecimal(100)).longValue();
wxBillDaily.setPay(pay);

wxBillDaily.setOwe(receivePay - pay);
wxBillDaily.setType(type);
Date receiveDate = billDaily.getReceiveDate();
wxBillDaily.setReceiveDate(receiveDate);
Date date = new Date();
if (pay > 0) {
wxBillDaily.setPayDate(date);
}
int expiredDay = DateUtils.daysBetween(receiveDate, date);
billDaily.setExpiredDay((long) expiredDay);
wxBillDaily.setExpiredDay((long) expiredDay);
if (expiredDay > 0) {
billDaily.setStatus(EnumBillRentStatus.NOT_PAID.getCode());
wxBillDaily.setStatus(EnumBillRentStatus.NOT_PAID.getCode());
} else {
billDaily.setStatus(EnumBillRentStatus.WAIT_PAY.getCode());
wxBillDaily.setStatus(EnumBillRentStatus.WAIT_PAY.getCode());
}
if (receivePayD == payD) {
billDaily.setStatus(EnumBillRentStatus.PAID.getCode());
wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode());
}

billDaily.setUserId(user.getId());
billDaily.setShopId(wxShop.getId());
billDaily.setRentShopType(wxShop.getType());
billDaily.setPayWay(EnumBillPayWay.OTHER.getCode());
billDaily.setCreatetime(date);
billDaily.setUpdatetime(date);
wxBillDaily.setUserId(user.getId());
wxBillDaily.setShopId(wxShop.getId());
wxBillDaily.setRentShopType(wxShop.getType());
wxBillDaily.setPayWay(EnumBillPayWay.OTHER.getCode());
wxBillDaily.setCreatetime(date);
wxBillDaily.setUpdatetime(date);
wxBillDaily.setIsDel(EnumDelStatus.NOT_DEL.getCode());
//商户
WxMerchantShop merchantShop = new WxMerchantShop();
merchantShop.setShopId(wxShop.getId());
merchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode());
WxMerchantShop wxMerchantShop = wxMerchantShopMapper.selectOne(merchantShop);
billDaily.setMerchantId(wxMerchantShop.getMerchantId());
wxBillDaily.setMerchantId(wxMerchantShop.getMerchantId());

final IdWorker idWorker = IdWorker.get();
billDaily.setId(idWorker.nextId());
wxBillDailyMapper.insertSelective(billDaily);
wxBillDaily.setId(idWorker.nextId());
wxBillDailyMapper.insertSelective(wxBillDaily);

//记数
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1);


Loading…
Cancel
Save