|
|
@@ -117,6 +117,10 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
|
|
|
queryWrapperT.eq("payment_id", hlwPaymentT.getId());
|
|
|
List<HlwPaymentDetail> hlwPaymentDetailList = hlwPaymentDetailService.list(queryWrapperT);
|
|
|
int size = hlwPaymentDetailList.size();
|
|
|
+ // 针对数据库该字段为null,未发起的情况
|
|
|
+ if (hlwPaymentT.getStatus() == null) {
|
|
|
+ hlwPaymentT.setStatus(-1);
|
|
|
+ }
|
|
|
switch (hlwPaymentT.getStatus()) {
|
|
|
case HlwConstant.PAYMENT_STATUS_PAY_BACK:
|
|
|
remark.append("合计").append(size).append("笔");
|
|
|
@@ -1442,7 +1446,7 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
|
|
|
queryWrapperT.eq("payment_id", hlwPaymentT.getId());
|
|
|
List<HlwPaymentDetail> hlwPaymentDetailList = hlwPaymentDetailService.list(queryWrapperT);
|
|
|
int size = hlwPaymentDetailList.size();
|
|
|
- if(hlwPaymentT.getStatus()!=null){
|
|
|
+ if (hlwPaymentT.getStatus() != null) {
|
|
|
switch (hlwPaymentT.getStatus()) {
|
|
|
case HlwConstant.PAYMENT_STATUS_PAY_BACK:
|
|
|
remark.append("合计").append(size).append("笔");
|
|
|
@@ -1486,7 +1490,7 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
|
|
|
public Result<?> deleteByLogic(HlwPayment hlwPayment) {
|
|
|
Result<?> result = new Result<>();
|
|
|
//付款单状态是否为打回/未发起
|
|
|
- if (hlwPayment.getStatus() != null && hlwPayment.getStatus() != HlwConstant.PAYMENT_STATUS_PAY_BACK ) {
|
|
|
+ if (hlwPayment.getStatus() != null && hlwPayment.getStatus() != HlwConstant.PAYMENT_STATUS_PAY_BACK) {
|
|
|
result.error500("该付款单状态已变更,请刷新后重试!");
|
|
|
return result;
|
|
|
}
|