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

[修改bug][修改][1001573]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
db0ca45042
6 измененных файлов: 19 добавлений и 14 удалений
  1. +0
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  2. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java
  3. +9
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  5. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  6. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java

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

@@ -92,9 +92,6 @@ public class WxMerchantTradeDailyController extends BaseController {
wxMerchantTradeDaily.getTradeAmt() == null) wxMerchantTradeDaily.getTradeAmt() == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
wxMerchantTradeDaily.setTenantId(getTenantId()); wxMerchantTradeDaily.setTenantId(getTenantId());
if(wxMerchantTradeDaily.getTradeCount() == null){
wxMerchantTradeDaily.setTradeCount(0);
}
if (wxMerchantTradeDaily.getReportDate() == null) { if (wxMerchantTradeDaily.getReportDate() == null) {
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); wxMerchantTradeDaily.setReportDate(fmt.format(new Date()));


+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java Просмотреть файл

@@ -85,7 +85,7 @@ public class WxMerchantTradeDailyController extends BaseController {
logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::saveOrUpdate"); logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::saveOrUpdate");
wxMerchantTradeDaily.setTenantId(super.getTenantId()); wxMerchantTradeDaily.setTenantId(super.getTenantId());
if(wxMerchantTradeDaily.getTradeAmt()!= null){ if(wxMerchantTradeDaily.getTradeAmt()!= null){
wxMerchantTradeDaily.setTradeAmt(wxMerchantTradeDaily.getTradeAmt()*100);
wxMerchantTradeDaily.setTradeAmt(Double.parseDouble(wxMerchantTradeDaily.getTradeAmt())*100 +"");
} }


WxMerchantBUser user = wxMerchantBUserService.getById(getUserId()); WxMerchantBUser user = wxMerchantBUserService.getById(getUserId());


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

@@ -1,6 +1,7 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils;


import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
@@ -30,7 +31,7 @@ public class WxMerchantTradeDaily implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "b用户id", name = "bUserId") @io.swagger.annotations.ApiModelProperty(value = "b用户id", name = "bUserId")
private Long bUserId; private Long bUserId;
@io.swagger.annotations.ApiModelProperty(value = "交易额", name = "tradeAmt") @io.swagger.annotations.ApiModelProperty(value = "交易额", name = "tradeAmt")
private Integer tradeAmt;
private String tradeAmt;
@io.swagger.annotations.ApiModelProperty(value = "解单提交日期", name = "createDate") @io.swagger.annotations.ApiModelProperty(value = "解单提交日期", name = "createDate")
private Date createDate; private Date createDate;
@io.swagger.annotations.ApiModelProperty(value = "解单更新日期", name = "updateDate") @io.swagger.annotations.ApiModelProperty(value = "解单更新日期", name = "updateDate")
@@ -45,6 +46,13 @@ public class WxMerchantTradeDaily implements Serializable {
@Transient @Transient
private String month; private String month;


public Integer getTradeAmtInteger(){
if (StringUtils.isBlank(tradeAmt)){
return 0;
}
return Integer.parseInt(tradeAmt);
}

@io.swagger.annotations.ApiModelProperty(value = "是否是当天 1是", name = "isToday") @io.swagger.annotations.ApiModelProperty(value = "是否是当天 1是", name = "isToday")
@Transient @Transient
private Integer isToday; private Integer isToday;


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

@@ -167,7 +167,7 @@ public class DataTowerServiceImpl implements DataTowerService {
} }
reportMap.put("reportCount", tradeCount); reportMap.put("reportCount", tradeCount);
reportMap.put("silenceCount", merchantCount - tradeCount); reportMap.put("silenceCount", merchantCount - tradeCount);
int reportTotal = tradeList.stream().mapToInt(WxMerchantTradeDaily::getTradeAmt).sum();
int reportTotal = tradeList.stream().mapToInt(WxMerchantTradeDaily::getTradeAmtInteger).sum();
reportMap.put("reportTotal", reportTotal); reportMap.put("reportTotal", reportTotal);


return reportMap; return reportMap;
@@ -473,7 +473,7 @@ public class DataTowerServiceImpl implements DataTowerService {
datamap.put("shsbl", 0); datamap.put("shsbl", 0);
} }


int shsbjg = tradelist.stream().mapToInt(WxMerchantTradeDaily::getTradeAmt).sum();
int shsbjg = tradelist.stream().mapToInt(WxMerchantTradeDaily::getTradeAmtInteger).sum();
datamap.put("shsbjg", shsbjg); datamap.put("shsbjg", shsbjg);


return datamap; return datamap;


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

@@ -393,7 +393,7 @@ public class WxChartServiceImpl implements WxChartDataService {
tradeList.add(trade); tradeList.add(trade);
} else { } else {
trade = new WxMerchantTradeDaily(); trade = new WxMerchantTradeDaily();
trade.setTradeAmt(0);
trade.setTradeAmt("0");
trade.setReportDate(fmtv.format(cal.getTime())); trade.setReportDate(fmtv.format(cal.getTime()));
tradeList.add(trade); tradeList.add(trade);
} }
@@ -2160,7 +2160,7 @@ public class WxChartServiceImpl implements WxChartDataService {
} else { } else {
datamap.put("shsbl", 0); datamap.put("shsbl", 0);
} }
int shsbjg = tradelist.stream().mapToInt(WxMerchantTradeDaily::getTradeAmt).sum();
int shsbjg = tradelist.stream().mapToInt(WxMerchantTradeDaily::getTradeAmtInteger).sum();
datamap.put("shsbjg", shsbjg); datamap.put("shsbjg", shsbjg);
return new ResultData(datamap); return new ResultData(datamap);
} }


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

@@ -103,7 +103,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ


if (tradeList.size() > 0 ) { if (tradeList.size() > 0 ) {
wxMerchantTradeDaily = tradeList.get(0); wxMerchantTradeDaily = tradeList.get(0);
wxMerchantTradeDaily.setTradeAmt(volume);
wxMerchantTradeDaily.setTradeAmt(volume+"");
wxMerchantTradeDaily.setUpdateDate(new Date()); wxMerchantTradeDaily.setUpdateDate(new Date());
wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(wxMerchantTradeDaily); wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(wxMerchantTradeDaily);
return new ResultData(wxMerchantTradeDaily); return new ResultData(wxMerchantTradeDaily);
@@ -114,7 +114,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
wxMerchantTradeDaily.setTenantId(merchant.getTenantId()); wxMerchantTradeDaily.setTenantId(merchant.getTenantId());
wxMerchantTradeDaily.setMerchantId(merchant.getId()); wxMerchantTradeDaily.setMerchantId(merchant.getId());
wxMerchantTradeDaily.setBUserId(userId); wxMerchantTradeDaily.setBUserId(userId);
wxMerchantTradeDaily.setTradeAmt(volume);
wxMerchantTradeDaily.setTradeAmt(volume+"");
wxMerchantTradeDaily.setCreateDate(new Date()); wxMerchantTradeDaily.setCreateDate(new Date());
wxMerchantTradeDaily.setUpdateDate(new Date()); wxMerchantTradeDaily.setUpdateDate(new Date());
wxMerchantTradeDailyMapper.insert(wxMerchantTradeDaily); wxMerchantTradeDailyMapper.insert(wxMerchantTradeDaily);
@@ -141,7 +141,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
if (tradeList.size() > 0) { if (tradeList.size() > 0) {
wxMerchantTradeDaily = tradeList.get(0); wxMerchantTradeDaily = tradeList.get(0);
wxMerchantTradeDaily.setUpdateDate(new Date()); wxMerchantTradeDaily.setUpdateDate(new Date());
wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt());
wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt()+"");
wxMerchantTradeDaily.setTradeCount(tradeDailyVo.getTradeCount()); wxMerchantTradeDaily.setTradeCount(tradeDailyVo.getTradeCount());
wxMerchantTradeDaily.setProof(tradeDailyVo.getProof()); wxMerchantTradeDaily.setProof(tradeDailyVo.getProof());
wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(wxMerchantTradeDaily); wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(wxMerchantTradeDaily);
@@ -152,7 +152,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
wxMerchantTradeDaily.setId(idWorker.nextId()); wxMerchantTradeDaily.setId(idWorker.nextId());
wxMerchantTradeDaily.setTenantId(tradeDailyVo.getTenantId()); wxMerchantTradeDaily.setTenantId(tradeDailyVo.getTenantId());
wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId()); wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId());
wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt());
wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt()+"");
wxMerchantTradeDaily.setCreateDate(new Date()); wxMerchantTradeDaily.setCreateDate(new Date());
wxMerchantTradeDaily.setUpdateDate(new Date()); wxMerchantTradeDaily.setUpdateDate(new Date());
wxMerchantTradeDaily.setTradeCount(tradeDailyVo.getTradeCount()); wxMerchantTradeDaily.setTradeCount(tradeDailyVo.getTradeCount());
@@ -232,7 +232,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
tradeList.add(trade); tradeList.add(trade);
}else { }else {
trade = new WxMerchantTradeDaily(); trade = new WxMerchantTradeDaily();
trade.setTradeAmt(0);
trade.setTradeAmt("0");
trade.setReportDate(fmtv.format(cal.getTime())); trade.setReportDate(fmtv.format(cal.getTime()));
tradeList.add(trade); tradeList.add(trade);
} }


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