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

fix trade daily

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
5ba68f9b45
3 измененных файлов: 13 добавлений и 73 удалений
  1. +7
    -64
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java
  3. +5
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java

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

@@ -50,32 +50,16 @@ public class WxMerchantTradeDailyController extends BaseController {
}

@ApiOperation("上报每日解单")
@GetMapping("/reportDailyVolume")
@ApiImplicitParams({
@ApiImplicitParam(name = "dateType", value = "类型", dataType = "Integer", paramType = "query", required = true),
@ApiImplicitParam(name = "volume", value = "总金额(分)", dataType = "Integer", paramType = "query", required = true),
@ApiImplicitParam(name = "reportDate", value = "解单日期", dataType = "String", paramType = "query", required = false)
})
public ResultData saveDailyTradingVolume(Integer dateType,Integer volume,String reportDate) {
return wxMerchantTradeDailyService.saveDailyTradingVolume(getLoginBUser(), volume,dateType,reportDate);
@PostMapping("/reportDailyVolume")
public ResultData saveDailyTradingVolume(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) {
return wxMerchantTradeDailyService.saveDailyTradingVolume(getLoginBUser(), wxMerchantTradeDaily);
}
@ApiOperation("更新每日解单")
@GetMapping("/updateDailyVolume")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "编码", dataType = "Long", paramType = "query", required = true),
@ApiImplicitParam(name = "dateType", value = "类型", dataType = "Integer", paramType = "query", required = true),
@ApiImplicitParam(name = "volume", value = "总金额(分)", dataType = "Integer", paramType = "query", required = true),
@ApiImplicitParam(name = "reportDate", value = "解单日期", dataType = "String", paramType = "query", required = false)
})
public ResultData updateDailyVolume(Long id,Integer dateType,Integer volume,String reportDate) {
WxMerchantTradeDaily tradeDaily = new WxMerchantTradeDaily();
tradeDaily.setId(id);
tradeDaily.updateTenantInfo(getTenantInfo());
tradeDaily.setDateType(dateType);
tradeDaily.setTradeAmt(String.valueOf(volume));
tradeDaily.setReportDate(reportDate);
return wxMerchantTradeDailyService.update(tradeDaily, null);
@PostMapping("/updateDailyVolume")
public ResultData updateDailyVolume(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) {
wxMerchantTradeDaily.updateTenantInfo(getTenantInfo());
return wxMerchantTradeDailyService.update(wxMerchantTradeDaily, null);
}

/**
@@ -91,47 +75,6 @@ public class WxMerchantTradeDailyController extends BaseController {
return new ResultData(wxMerchantTradeDailyService.getById(wxMerchantTradeDaily.getId()));
}

/**
* 保存或编辑
* @param wxMerchantTradeDaily
* @return
*/
@ApiOperation("保存或编辑")
@PostMapping("saveOrUpdate")
public ResultData saveOrUpdate(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) {
logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::saveOrUpdate");
wxMerchantTradeDaily.updateTenantInfo(getTenantInfo());
if(wxMerchantTradeDaily.getTradeAmt()!= null){
wxMerchantTradeDaily.setTradeAmt(Double.parseDouble(wxMerchantTradeDaily.getTradeAmt())*100 +"");
}

WxMerchantBUser user = wxMerchantBUserService.getById(getLoginBUser().getId());
if (user==null)
return new ResultData(ErrorCode.USER_IS_EMPTY);
WxMerchant merchant = wxMerchantService.getById(user.getMerchantId());
if (merchant==null)
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND);
wxMerchantTradeDaily.setMerchantId(merchant.getId());

// 不能设置未来时间
if(wxMerchantTradeDaily.getReportDate() !=null){
try {
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
if(sd.parse(wxMerchantTradeDaily.getReportDate()).after(new Date())){
return new ResultData(ErrorCode.MERCHANT_REPORT_DATE_NOT_VALID);
}
}catch (Exception e){
e.printStackTrace();
logger.error("format date error",e);
}

}
wxMerchantTradeDaily.setbUserId(getLoginBUser().getId());
wxMerchantTradeDaily.setBUserId(getLoginBUser().getId());
wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily);
return new ResultData();
}

/**
* 列表
*


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

@@ -52,7 +52,7 @@ public interface WxMerchantTradeDailyService {
* @param volume
*/

ResultData saveDailyTradingVolume(WxMerchantBUser merchantBUser, Integer volume,Integer dateType,String reportDate);
ResultData saveDailyTradingVolume(WxMerchantBUser merchantBUser, WxMerchantTradeDaily wxMerchantTradeDaily);

/**
* 获取当日解单数据


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

@@ -95,16 +95,16 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
}

@Override
public ResultData saveDailyTradingVolume(WxMerchantBUser merchantBUser, Integer volume,Integer dateType,String reportDate) {
EnumTradeDailyDateType _da = EnumTradeDailyDateType.getEnum(dateType);
public ResultData saveDailyTradingVolume(WxMerchantBUser merchantBUser, WxMerchantTradeDaily wxMerchantTradeDaily) {
EnumTradeDailyDateType _da = EnumTradeDailyDateType.getEnum(wxMerchantTradeDaily.getDateType());
if (null == _da) {
return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(),"日期类型非法");
}
if (_da.getCode().intValue() == EnumTradeDailyDateType.DAY.getCode().intValue()
&& StringUtils.isBlank(reportDate)) {
&& StringUtils.isBlank(wxMerchantTradeDaily.getReportDate())) {
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
reportDate = fmt.format(new Date());
wxMerchantTradeDaily.setReportDate(fmt.format(new Date()));
}else {
return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(),"日期不能为空");
}
@@ -119,21 +119,18 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND);
}

WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily();
wxMerchantTradeDaily.setMerchantId(merchant.getId());
wxMerchantTradeDaily.setDateType(dateType);
try {
checkTradeDaily(wxMerchantTradeDaily);
}catch(Exception e) {
return new ResultData(Result.ERROR,e.getMessage());
}
wxMerchantTradeDaily.setReportDate(reportDate);
final IdWorker idWorker = IdWorker.get();
wxMerchantTradeDaily.setId(idWorker.nextId());
wxMerchantTradeDaily.updateTenantInfo(merchant);
wxMerchantTradeDaily.setMerchantId(merchant.getId());
wxMerchantTradeDaily.setbUserId(merchantBUser.getId());
wxMerchantTradeDaily.setTradeAmt(volume + "");
//wxMerchantTradeDaily.setTradeAmt(volume + "");
wxMerchantTradeDaily.setCreateDate(new Date());
wxMerchantTradeDaily.setUpdateDate(new Date());
wxMerchantTradeDailyMapper.insert(wxMerchantTradeDaily);


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