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

fix trade daily

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
98e6c04cad
7 измененных файлов: 27 добавлений и 11 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDailyHistory.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java
  6. +17
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java
  7. +4
    -0
      mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml

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

@@ -122,7 +122,7 @@ public class WxMerchantTradeDailyController extends BaseController {
public ResultData queryTradeDailyHistory(@ModelAttribute WxMerchantTradeDailyHistory wxMerchantTradeDailyHistory, Integer pageNum, Integer pageSize) { public ResultData queryTradeDailyHistory(@ModelAttribute WxMerchantTradeDailyHistory wxMerchantTradeDailyHistory, Integer pageNum, Integer pageSize) {
wxMerchantTradeDailyHistory.updateTenantInfo(getTenantInfo()); wxMerchantTradeDailyHistory.updateTenantInfo(getTenantInfo());
wxMerchantTradeDailyHistory.setSortColumns(SortField.CreateDate_ASC); wxMerchantTradeDailyHistory.setSortColumns(SortField.CreateDate_ASC);
PageInfo<WxMerchantTradeDailyHistory> page = wxMerchantTradeDailyService.listHistoryAsPageVo(wxMerchantTradeDailyHistory, pageNum, pageSize);
PageInfo<WxMerchantTradeDailyVo> page = wxMerchantTradeDailyService.listHistoryAsPageVo(wxMerchantTradeDailyHistory, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }




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

@@ -52,6 +52,8 @@ public class WxMerchantTradeDaily extends TenantEntity {
protected String reportDate; protected String reportDate;
@TableField(exist = false) @TableField(exist = false)
private String reportDateLike; private String reportDateLike;
@TableField(exist = false)
private String reportDateOrMonthLike;
@io.swagger.annotations.ApiModelProperty(value = "解单日期类型EnumTradeDailyDateType", name = "dateType") @io.swagger.annotations.ApiModelProperty(value = "解单日期类型EnumTradeDailyDateType", name = "dateType")
protected Integer dateType; protected Integer dateType;
@io.swagger.annotations.ApiModelProperty(value = "交易笔数", name = "tradeCount") @io.swagger.annotations.ApiModelProperty(value = "交易笔数", name = "tradeCount")


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

@@ -18,5 +18,5 @@ public class WxMerchantTradeDailyHistory extends WxMerchantTradeDaily {
protected Long id; protected Long id;


@io.swagger.annotations.ApiModelProperty(value = "tradeDailyId", name = "tradeDailyId") @io.swagger.annotations.ApiModelProperty(value = "tradeDailyId", name = "tradeDailyId")
private Long tradeDailyId;
protected Long tradeDailyId;
} }

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

@@ -66,7 +66,7 @@ public class WxMerchantTradeDailyVo extends TenantEntity {
this.bUserName = bUserName; this.bUserName = bUserName;
} }


@Excel(name = "提交户名", width = 20, orderNum = "6")
@Excel(name = "提交B端用户名", width = 20, orderNum = "6")
@io.swagger.annotations.ApiModelProperty(value = "b端用户姓名", name = "bUserName") @io.swagger.annotations.ApiModelProperty(value = "b端用户姓名", name = "bUserName")
private String bUserName; private String bUserName;


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

@@ -87,7 +87,7 @@ public interface WxMerchantTradeDailyService {
*/ */
PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize); PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize);
PageInfo<WxMerchantTradeDailyHistory> listHistoryAsPageVo(WxMerchantTradeDailyHistory record, Integer pageIndex, Integer pageSize);
PageInfo<WxMerchantTradeDailyVo> listHistoryAsPageVo(WxMerchantTradeDailyHistory record, Integer pageIndex, Integer pageSize);


ResultData add(WxMerchantTradeDaily tradeDailyVo,MallUserInfo mallUserInfo); ResultData add(WxMerchantTradeDaily tradeDailyVo,MallUserInfo mallUserInfo);
ResultData update(WxMerchantTradeDaily tradeDailyVo,MallUserInfo mallUserInfo); ResultData update(WxMerchantTradeDaily tradeDailyVo,MallUserInfo mallUserInfo);


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

@@ -76,10 +76,17 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
} }
@Override @Override
public PageInfo<WxMerchantTradeDailyHistory> listHistoryAsPageVo(WxMerchantTradeDailyHistory record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyHistoryMapper.findList(record));
public PageInfo<WxMerchantTradeDailyVo> listHistoryAsPageVo(WxMerchantTradeDailyHistory record, Integer pageIndex, Integer pageSize) {
PageInfo<WxMerchantTradeDailyHistory> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyHistoryMapper.findList(record));
PageInfo<WxMerchantTradeDailyVo> retPageInfo = new PageInfo<WxMerchantTradeDailyVo>();
retPageInfo.setPageNum(pageIndex);
retPageInfo.setPageSize(pageSize);
retPageInfo.setPages(pageInfo.getPages());
retPageInfo.setTotal(pageInfo.getTotal());
retPageInfo.setList(toVoList(pageInfo.getList(), record));
return retPageInfo;
} }

@Override @Override
public WxMerchantTradeDaily getById(Long id) { public WxMerchantTradeDaily getById(Long id) {
return wxMerchantTradeDailyMapper.selectById(id); return wxMerchantTradeDailyMapper.selectById(id);
@@ -196,7 +203,9 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
} }
} }
private List<WxMerchantTradeDailyVo> toVoList(List<WxMerchantTradeDaily> list,TenantEntity tenantEntity) {
private List<WxMerchantTradeDailyVo> toVoList(List<? extends WxMerchantTradeDaily> list,TenantEntity tenantEntity) {
if (null == list || list.size() <= 0 ){ if (null == list || list.size() <= 0 ){
return null; return null;
} }
@@ -344,11 +353,12 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
wxMerchantTradeDaily.setMerchantId(tradeDaily.getMerchantId()); wxMerchantTradeDaily.setMerchantId(tradeDaily.getMerchantId());
String errormsg = "解单数据已存在"; String errormsg = "解单数据已存在";
if (tradeDaily.getDateType().intValue() == EnumTradeDailyDateType.DAY.getCode().intValue()) { if (tradeDaily.getDateType().intValue() == EnumTradeDailyDateType.DAY.getCode().intValue()) {
wxMerchantTradeDaily.setReportDate(tradeDaily.getReportDate());
errormsg = "当天解单数据已存在";
//按日还要查询按月的有没有
wxMerchantTradeDaily.setReportDateOrMonthLike(tradeDaily.getReportDate());
errormsg = "已存在当天或者当月的解单数据";
}else if (tradeDaily.getDateType().intValue() == EnumTradeDailyDateType.MONTH.getCode().intValue()) { }else if (tradeDaily.getDateType().intValue() == EnumTradeDailyDateType.MONTH.getCode().intValue()) {
wxMerchantTradeDaily.setReportDateLike(tradeDaily.getReportDate()); wxMerchantTradeDaily.setReportDateLike(tradeDaily.getReportDate());
errormsg = "当前月已存在解单数据或者已存在当按天提报的解单数据";
errormsg = "已存在当月的解单数据";
} }
List<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); List<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily);


+ 4
- 0
mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml Просмотреть файл

@@ -59,6 +59,10 @@
<if test=" null != reportDate "> <if test=" null != reportDate ">
and `report_date` = #{reportDate} and `report_date` = #{reportDate}
</if> </if>
<if test=" null != reportDateOrMonthLike and '' != reportDateOrMonthLike">
and (`report_date` = #{reportDateOrMonthLike} or report_date like concat('', date_format(#{reportDateOrMonthLike},'%Y-%m'),'-%'))
</if>


<if test=" null != month "> <if test=" null != month ">
and date_format(create_date,'%Y-%m')=#{month} and date_format(create_date,'%Y-%m')=#{month}


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