ufo / ufo-platform · Commits

Go to a project

Authored by LUOXC
Commit bd87882ef397f56c04f2e22126b807e977137595 2 parents de6a760a 20d5a3c0

Merge branch 'hotfix-20200304' into test6.9.22

Inline Side-by-side
Showing 2 changed files with 25 additions and 19 deletions
... ... @@ -217,7 +217,7 @@ public class TradeBillsServiceImpl implements ITradeBillsService {
if (Objects.nonNull(req.getStartTime()) && Objects.nonNull(req.getEndTime())) {
int range = req.getEndTime() - req.getStartTime();
ServiceExceptions.throwServiceExceptionIf(range < 0, "结束时间小于开始时间");
ServiceExceptions.throwServiceExceptionIf(range > 30 * 24 * 3600, "时间范围最大为30天");
ServiceExceptions.throwServiceExceptionIf(range > 31 * 24 * 3600, "时间范围最大为31天");
}
if (StringUtils.isBlank(req.getPayErrorCode())) {
... ...
... ... @@ -22,7 +22,7 @@
<label>手机号：</label>
<input id="mobile" type="text" class="easyui-textbox" style="width:150px"/>
<label>打款时间：</label>
<label>首次打款时间：</label>
<input id="startTime" type="text">
<input id="endTime" type="text">
<br><br>
... ... @@ -185,8 +185,8 @@ function loadTradeBillsData(reload) {
if (startTime > endTime) {
$.messager.alert("提示", "开始日期不能超过结束日期");
return;
} else if (endTime - startTime > 7 * 24 * 3600) {
$.messager.alert("提示", "日期差不能超过7天");
} else if (endTime - startTime > 31 * 24 * 3600) {
$.messager.alert("提示", "日期差不能超过一个月");
return;
}
}
... ... @@ -291,22 +291,28 @@ function getTradeBillsList(){
width: 40,
align: "center",
formatter: function (value, rowData, rowIndex) {
// 已收款 和 等待打款结果 不可以打款
if (rowData.tradeStatus != 100 && rowData.tradeStatus != 90) {
var btn= "<a role='confirmDialog' onclick='openConfirmDialog(\"%s\",\"%s\",\"%s\",\"%s\",\"%s\")' style='margin-left:10px;background-color: #5cb85c !important;'>打款</a>";
btn = btn.replace("%s",rowData.id);
btn = btn.replace("%s",rowData.uid);
btn = btn.replace("%s",rowData.orderCode);
btn = btn.replace("%s",rowData.alipayAccount);
btn = btn.replace("%s",rowData.amount);
var markPaidbtn= "<a role='confirmDialog' onclick='openMarkPaidConfirmDialog(\"%s\",\"%s\",\"%s\",\"%s\",\"%s\")' style='margin-left:10px;background-color: #d9534f !important;'>已打款</a>";
markPaidbtn = markPaidbtn.replace("%s",rowData.id);
markPaidbtn = markPaidbtn.replace("%s",rowData.uid);
markPaidbtn = markPaidbtn.replace("%s",rowData.orderCode);
markPaidbtn = markPaidbtn.replace("%s",rowData.alipayAccount);
markPaidbtn = markPaidbtn.replace("%s",rowData.amount);
return btn + markPaidbtn;
var tradeStatus = rowData.tradeStatus;
if(tradeStatus == 100){
return;
}
// 构造已打款按钮
var markPaidBtn= "<a role='confirmDialog' onclick='openMarkPaidConfirmDialog(\"%s\",\"%s\",\"%s\",\"%s\",\"%s\")' style='margin-left:10px;background-color: #d9534f !important;'>已打款</a>";
markPaidBtn = markPaidBtn.replace("%s",rowData.id);
markPaidBtn = markPaidBtn.replace("%s",rowData.uid);
markPaidBtn = markPaidBtn.replace("%s",rowData.orderCode);
markPaidBtn = markPaidBtn.replace("%s",rowData.alipayAccount);
markPaidBtn = markPaidBtn.replace("%s",rowData.amount);
if (tradeStatus == 90) {
return markPaidBtn;
}
// 构造打款按钮
var payBtn= "<a role='confirmDialog' onclick='openConfirmDialog(\"%s\",\"%s\",\"%s\",\"%s\",\"%s\")' style='margin-left:10px;background-color: #5cb85c !important;'>打款</a>";
payBtn = payBtn.replace("%s",rowData.id);
payBtn = payBtn.replace("%s",rowData.uid);
payBtn = payBtn.replace("%s",rowData.orderCode);
payBtn = payBtn.replace("%s",rowData.alipayAccount);
payBtn = payBtn.replace("%s",rowData.amount);
return payBtn + markPaidBtn;
}
}]],
cache: false,
... ...