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

[解单][修改][更新]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
0799aa381c
3 измененных файлов: 14 добавлений и 11 удалений
  1. +3
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java
  2. +8
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java
  3. +3
    -3
      mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml

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

@@ -10,10 +10,7 @@ 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.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -63,8 +60,8 @@ public class WxMerchantTradeDailyController extends BaseController {
}

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


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

@@ -19,6 +19,8 @@ import com.iformall.service.WxMerchantTradeDailyService;
import com.iformall.service.WxMallService;
import com.iformall.service.WxMerchantBUserService;
import com.iformall.service.WxMerchantService;
import com.iformall.utils.DateUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -129,7 +131,11 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ

WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily();
wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId());
wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate());
if (StringUtils.isEmpty(tradeDailyVo.getReportDate())) {
wxMerchantTradeDaily.setReportDate(DateUtils.getTimeBefore(1, new Date()));
} else {
wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate());
}
List<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily);

if (tradeList.size() > 0) {
@@ -158,7 +164,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId());
wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate());
List<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily);
wxMerchantTradeDaily = tradeList.size() > 0 ? tradeList.get(0) : null;
wxMerchantTradeDaily = tradeList.size() > 0 ? tradeList.get(0) : new WxMerchantTradeDaily();
return new ResultData(wxMerchantTradeDaily);
}



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

@@ -19,8 +19,8 @@
<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
<if test=" null != id ">
and `id` = #{id}
</if>
@@ -119,7 +119,7 @@

where 1=1
and m.status = 1
<if test=" null != merchantName ">
<if test=" null != merchantName and ''!=merchantName">
and m.name like concat('%', #{merchantName},'%')
</if>



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