|
|
@@ -39,6 +39,7 @@ import com.qunzhixinxi.hnqz.admin.enums.PackageStatusEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.enums.PackageTypeEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.enums.ReportEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.enums.ScorePackageStatusEnum;
|
|
|
+import com.qunzhixinxi.hnqz.admin.enums.SettleStatusEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.enums.TaskStatusEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.mapper.*;
|
|
|
import com.qunzhixinxi.hnqz.admin.recharge.entity.SysDeptRecharge;
|
|
|
@@ -2468,9 +2469,14 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
WmScorePackageSettleNote note = settleNoteMapper.selectOne(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
|
|
|
.eq(WmScorePackageSettleNote::getPackageId, scorePackage.getId()).last("limit 1"));
|
|
|
|
|
|
+ scorePackage.setSettleAmount(null);
|
|
|
if (note != null) {
|
|
|
scorePackage.setNotifyDate(note.getNotifyTime());
|
|
|
scorePackage.setSubToGigTime(note.getSubToGigTime());
|
|
|
+ scorePackage.setSettleStatus(note.getSettleNoteStatus());
|
|
|
+ if (SettleStatusEnum.SETTLE_STATUS_SUCCESS.getVal().equals(String.valueOf(note.getSettleNoteStatus()))) {
|
|
|
+ scorePackage.setSettleAmount(note.getSettleAmount());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (packageType2 == 2) {
|
