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

[需求][修复]:导出数据统一接口问题

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
1305846965
5 измененных файлов: 22 добавлений и 45 удалений
  1. +8
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java
  2. +4
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java
  3. +3
    -16
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  4. +2
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
  5. +5
    -11
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java

+ 8
- 6
mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java Просмотреть файл

@@ -79,9 +79,11 @@ public class WxCardSpend implements Serializable {
@Transient
@Excel(name="消费金额",width = 20,orderNum = "7")
private String deductionAmountStr;

@Transient
@Excel(name="收款金额",width = 20,orderNum = "8")
private String paymentStr;

@Transient
@Excel(name="收款实际金额",width = 20,orderNum = "9")
private String realPaymentStr;
@@ -101,8 +103,8 @@ public class WxCardSpend implements Serializable {
private Date enddate;

public String getDeductionAmountStr() {
if(getDeductionAmountStr()!=null) {
deductionAmountStr = new BigDecimal(getDeductionAmountStr()).divide(new BigDecimal(100)).toString();
if(getDeductionAmount()!=null) {
deductionAmountStr = new BigDecimal(getDeductionAmount()).divide(new BigDecimal(100)).toString();
}
return deductionAmountStr;
}
@@ -112,8 +114,8 @@ public class WxCardSpend implements Serializable {
}

public String getPaymentStr() {
if(getPaymentStr()!=null) {
paymentStr = new BigDecimal(getPaymentStr()).divide(new BigDecimal(100)).toString();
if(getPayment()!=null) {
paymentStr = new BigDecimal(getPayment()).divide(new BigDecimal(100)).toString();
}
return paymentStr;
}
@@ -123,8 +125,8 @@ public class WxCardSpend implements Serializable {
}

public String getRealPaymentStr() {
if(getRealPaymentStr()!=null) {
realPaymentStr = new BigDecimal(getRealPaymentStr()).divide(new BigDecimal(100)).toString();
if(getRealPayment()!=null) {
realPaymentStr = new BigDecimal(getRealPayment()).divide(new BigDecimal(100)).toString();
}
return realPaymentStr;
}


+ 4
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java Просмотреть файл

@@ -103,8 +103,8 @@ public class WxMerchantSubsidy implements Serializable {

public String getOrderPaymentStr() {

if(getOrderPaymentStr()!=null) {
orderPaymentStr = new BigDecimal(getOrderPaymentStr()).divide(new BigDecimal(100)).toString();
if(getOrderPayment()!=null) {
orderPaymentStr = new BigDecimal(getOrderPayment()).divide(new BigDecimal(100)).toString();
}
return orderPaymentStr;
}
@@ -114,8 +114,8 @@ public class WxMerchantSubsidy implements Serializable {
}

public String getReceiverPaymentStr() {
if(getReceiverPaymentStr()!=null) {
receiverPaymentStr = new BigDecimal(getReceiverPaymentStr()).divide(new BigDecimal(100)).toString();
if(getReceiverPayment()!=null) {
receiverPaymentStr = new BigDecimal(getReceiverPayment()).divide(new BigDecimal(100)).toString();
}
return receiverPaymentStr;
}


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

@@ -1,12 +1,8 @@
package com.iformall.service.impl;

import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode;

import com.iformall.common.IdWorker;
import com.iformall.domain.dto.WxCUserBasicInfoDto;
import com.iformall.domain.po.WxCUser;
@@ -18,21 +14,13 @@ import com.iformall.domain.vo.CUserBaseVo;
import com.iformall.domain.vo.CUserTagVo;
import com.iformall.domain.vo.WxCUserBasicInfoVo;
import com.iformall.enums.EnumScoreType;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.*;
import com.iformall.service.ExcelService;
import com.iformall.service.WxCUserBasicInfoService;
import com.iformall.service.WxCUserTagsService;
import com.iformall.service.WxScoreRulesService;
import com.iformall.utils.Constant;
import com.iformall.utils.DownFileUtil;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.streaming.SXSSFSheet;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,8 +28,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.URLEncoder;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;


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

@@ -14,12 +14,7 @@ import com.iformall.mapper.*;
import com.iformall.service.ExcelService;
import com.iformall.service.WxCardSpendService;
import com.iformall.service.WxProfitSharingOrderService;
import com.iformall.utils.Constant;
import org.apache.commons.io.FileUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,8 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;

import java.util.*;

@Service


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

@@ -7,18 +7,13 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMerchantSubsidy;
import com.iformall.domain.vo.WxMerchantSubsidyVo;
import com.iformall.enums.EnumMerchantSubsidyStatus;
import com.iformall.enums.EnumOrderType;

import com.iformall.mapper.WxMerchantSubsidyMapper;
import com.iformall.service.ExcelService;
import com.iformall.service.WxMerchantSubsidyService;
import com.iformall.utils.Constant;
import org.apache.commons.io.FileUtils;

import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker;
@@ -26,11 +21,10 @@ import com.iformall.common.IdWorker;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;

import java.util.List;
import java.util.Map;
import java.util.UUID;

@Service
public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService {


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