|
|
|
@@ -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(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 列表 |
|
|
|
* |
|
|
|
|