Procházet zdrojové kódy

[商户解单][修改][修改解单数据]

release_toaliyun_real
gongbiao před 7 roky
rodič
revize
0d25c1c36b
3 změnil soubory, kde provedl 43 přidání a 3 odebrání
  1. +12
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java
  3. +29
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java

+ 12
- 2
mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java Zobrazit soubor

@@ -2,7 +2,6 @@ package com.iformall.controller;

import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMerchantTradeDaily;
import com.iformall.domain.vo.WxMerchantTradeDailyVo;
import com.iformall.service.WxMerchantTradeDailyService;
import io.swagger.annotations.ApiImplicitParam;
@@ -11,7 +10,10 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -60,5 +62,13 @@ public class WxMerchantTradeDailyController extends BaseController {
return wxMerchantTradeDailyService.getVolumeTotalOfMonth(getTenantId());
}

@ApiOperation("更新解单数据")
@GetMapping("/updateYesterday")
public ResultData updateYesterday(@ModelAttribute WxMerchantTradeDailyVo wxMerchantTradeDaily) {
logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::updateYesterday");
wxMerchantTradeDaily.setTenantId(getTenantId());
return wxMerchantTradeDailyService.updateYesterday(wxMerchantTradeDaily);
}


}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java Zobrazit soubor

@@ -82,4 +82,6 @@ public interface WxMerchantTradeDailyService {
*/
PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDailyVo record, Integer pageIndex, Integer pageSize);

ResultData updateYesterday(WxMerchantTradeDailyVo tradeDailyVo);

}

+ 29
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java Zobrazit soubor

@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMall;
import com.iformall.domain.po.WxMerchant;
@@ -21,7 +22,6 @@ import com.iformall.service.WxMerchantService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.security.SecurityProperties;
import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker;

@@ -124,6 +124,34 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findListVo(record));
}

@Override
public ResultData updateYesterday(WxMerchantTradeDailyVo tradeDailyVo) {

WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily();
wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId());
wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate());
List<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily);

if (tradeList.size() > 0) {
wxMerchantTradeDaily = tradeList.get(0);
wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt());
wxMerchantTradeDaily.setUpdateDate(new Date());
wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(wxMerchantTradeDaily);
return new ResultData(wxMerchantTradeDaily);
}

final IdWorker idWorker = IdWorker.get();
wxMerchantTradeDaily.setId(idWorker.nextId());
wxMerchantTradeDaily.setTenantId(tradeDailyVo.getTenantId());
wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId());
wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt());
wxMerchantTradeDaily.setCreateDate(new Date());
wxMerchantTradeDaily.setUpdateDate(new Date());
wxMerchantTradeDailyMapper.insert(wxMerchantTradeDaily);

return new ResultData(Result.SUCCESS, "操作成功");
}

@Override
public ResultData getVolumeOfMonth(Long merchantId) {



Načítá se…
Zrušit
Uložit