tangfang/pangd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

修改注释

Browse Source
This commit is contained in:
tangfang
2024-12-23 16:33:47 +08:00
parent 30b26e14af
commit e0910da20b
15 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/pangding/v2/checkReport/service/impl/ReportCheckServiceImpl.java
View File

@@ -145,7 +145,6 @@ public class ReportCheckServiceImpl implements ReportCheckService {
ObjectHelper.writeWithFromClass(reportManageOrderInfoReqVo, checkReportResVo);
reportManageOrderInfoReqVo.setPageIndex(1);
reportManageOrderInfoReqVo.setPageSize(500);
if(1 == dateType){
// 游玩时间
reportManageOrderInfoReqVo.setStartPlayDate(checkReportResVo.getPlayDate() + " 00:00:00");
@@ -248,8 +247,6 @@ public class ReportCheckServiceImpl implements ReportCheckService {
+ "=" + (reportMoney - realMoney ));
saveSystemWarnService.saveWarn(checkReportResVo, "报表自查资金对账"+ pdReportListResVo.getHandleDate(), actualMoney, realMoney, moneyCheck,
"报表资金不等。" + actualMoney + "-" + realMoney + "=" + moneyCheck);
}else{
}
}
}

7
src/main/java/com/pangding/v2/checkReport/service/impl/ReportDetailCheckServiceImpl.java
View File

@@ -44,15 +44,14 @@ public class ReportDetailCheckServiceImpl implements ReportDetailCheckService {
for (PdReportDetailListResVo pdReportDetailListResVo : pdReportDetailListResVoPageSizeData.getList()) {
CheckReportResVo checkReportResVo1 = new CheckReportResVo();
ObjectHelper.writeWithFromClass(checkReportResVo1, pdReportDetailListResVo);
// }
CheckReportCheckResVo checkNumFalg = checkNumUtil.checkNum(checkReportResVo);
CheckReportCheckResVo checkMoneyFalg = checkNumUtil.checkMoney(checkReportResVo);
CheckReportCheckResVo checkActualNumFalg = checkNumUtil.checkActualNum(checkReportResVo);
CheckReportCheckResVo checkActualMoneyFalg = checkNumUtil.checkActualMoney(checkReportResVo);
if (checkNumFalg.isFlag() || checkMoneyFalg.isFlag()
|| checkActualNumFalg.isFlag() || checkActualMoneyFalg.isFlag()) {
// if (checkNumFalg.isFlag() || checkMoneyFalg.isFlag()
// || checkActualNumFalg.isFlag() || checkActualMoneyFalg.isFlag()) {
// errorOrderIdList.add(pdReportDetailListResVo.getOrderId());
}
// }
}
if (reportManageOrderInfoReqVo.getPageSize() == pdReportDetailListResVoPageSizeData.getList().size()) {

12
src/main/java/com/pangding/web/order/service/check/finish/impl/DistributionCheckBackHandleCheck.java
View File

@@ -44,13 +44,11 @@ public class DistributionCheckBackHandleCheck implements DistributionCheckBackHa
orderCheckVo.setProductName(order.getProductName());
orderCheckVo.setCreateTime(DateHelper.getNow());
if ("tbdInterface".equals(order.getInterfaceCompanyId())) {
// 途比达通知
}
// if ("tbdInterface".equals(order.getInterfaceCompanyId())) {
// // 途比达通知
//
//
// }
temp.getChecks().add(orderCheckVo);
}
}

2
src/main/java/com/pangding/web/order/service/groupOrder/impl/GroupOrderTicketDatabaseImpl.java
View File

@@ -32,7 +32,7 @@ public class GroupOrderTicketDatabaseImpl implements GroupOrderTicketDatabase {
int y = orderStatusDao.updateOrderStatus(status);
if (y < 1) {
// 没有更新成功，说明有其他人修改,需要抛出连接错误，从而重新执行
// throw new RuntimeCodeException("出票回调修改订单状态失败!" + JsonHelper.serialize(status));
throw new RuntimeCodeException("出票回调修改订单状态失败!" + JsonHelper.serialize(status));
}
}

3
src/main/java/com/pangding/web/order/service/order/base/LoadOrderAll.java
View File

@@ -93,7 +93,8 @@ public class LoadOrderAll implements LoadOrder {
List<OrderImgVo> orderImgVoList = orderImgDao.loadList(new OrderImgVo(orderVo.getId()), OrderImgVo.class);
orderVo.setOrderImgList(orderImgVoList);
if(1 == orderVo.getIsFetch() && !StringHelper.isEmpty(orderVo.getAreaCode())){
if(1 == orderVo.getIsFetch() && !StringHelper.isEmpty(orderVo.getAreaCode())
&& !StringHelper.isEmpty(orderVo.getUserId())){
FetchNumberReqVo fetchNumberReqVo = new FetchNumberReqVo();
fetchNumberReqVo.setOrderId(orderVo.getId());
fetchNumberReqVo.setMerchantCode(orderVo.getMerchantCode());

3
src/main/java/com/pangding/web/order/service/pay/refundback/money/PayRefundBackMoneyDetailOtherMoney.java
View File

@@ -24,8 +24,5 @@ public class PayRefundBackMoneyDetailOtherMoney implements PayRefundBackMoneyDet
if (OrderConstant.ORDER_MONEY_DETAIL_TYPE == StringHelper.toInt(orderMoneyDetailResVo.getType())) {
return;
}
if (OrderConstant.ENTRY_STATUS_SUCCESS == orderMoneyDetailResVo.getEntryStatus()) {
}
}
}

8
src/main/java/com/pangding/web/order/service/pay/refundback/money/PayRefundBackMoneyDetailRefundFee.java
View File

@@ -18,8 +18,8 @@ import org.springframework.stereotype.Component;
*/
@Component
@Order(1)
public class PayRefundBackMoneyDetailRefundFee {
// implements PayRefundBackMoneyDetail
public class PayRefundBackMoneyDetailRefundFee {
// implements PayRefundBackMoneyDetail
// @Override
public void handleMoneyDetail(PayRefundBackTempVo temp, PayRefundBackReqVo req, OrderResVo order, OrderRefundVo refundHis, OrderMoneyDetailVo orderMoneyDetailResVo) {
// 交易订单需要修改订单退款价格 分润订单则不用
@@ -51,7 +51,9 @@ public class PayRefundBackMoneyDetailRefundFee {
temp.setFee(refundFee);
}
} else if (refundNum > 0 && refundUnitPrice < money) {
// TODO
double refundFeeMedian = CalcHelper.mul(refundHis.getRefundMoney(), orderMoneyDetailResVo.getOrderFee());
double refundFee = CalcHelper.div(refundFeeMedian, orderMoneyDetailResVo.getOrderMoney());
} else {
if (orderMoneyDetailResVo.getOrderFee() > 0) {
// 订单剩余金额手续费

8
src/main/java/com/pangding/web/order/service/ret/sync/impl/OrderReturnSyncHandleTourist.java
View File

@@ -75,10 +75,10 @@ public class OrderReturnSyncHandleTourist implements OrderReturnSyncHandle {
throw new CodecException("没有找到该游客信息，订单信息可能不匹配");
}
}
if(!StringHelper.isEmpty(orderTouristResVo.getVisitorStatus()) && 3 == orderTouristResVo.getVisitorStatus()){
// 该用户已退票
// refundNum--;
}
// if(!StringHelper.isEmpty(orderTouristResVo.getVisitorStatus()) && 3 == orderTouristResVo.getVisitorStatus()){
// // 该用户已退票
//// refundNum--;
// }
if(!StringHelper.isEmpty(orderTouristResVo.getVisitorStatus()) && 1 == orderTouristResVo.getVisitorStatus()){
// 该用户的票已使用
checkRefundNum++;

4
src/main/java/com/pangding/web/order/service/ret/sync/impl/OrderReturnSyncServiceImpl.java
View File

@@ -90,6 +90,10 @@ public class OrderReturnSyncServiceImpl implements OrderReturnSyncService {
&& OrderConstant.SUB_ORDER_DEPOSIT == order.getSubOrderType()){
return;
}
// 第三方同步订单不处理
if(OrderConstant.SUB_ORDER_PRESTORE == order.getSubOrderType()){
return;
}
updateOrderRefundReq(req, order);
// 获取押金订单
OrderResVo depositOrder = createLock.getSubDepositOrder(order.getId());

6
src/main/java/com/pangding/web/order/service/ret/sync/money/OrderReturnSyncMoneyDetail.java
View File

@@ -101,7 +101,8 @@ public class OrderReturnSyncMoneyDetail {
}
orderMoneyDetailResVo.setReceivableAmount(CalcHelper.sub(orderMoneyDetailResVo.getReceivableAmount(),costPriceTotal));
} else if (allRefundMoney > refundMoneyHas) {
}
if (allRefundMoney > refundMoneyHas) {
// 部分退
long reund = backAmount - scenicFee - feeAmount;
double doubleRefund = getDoubleWithLongMinute(reund);
@@ -113,9 +114,6 @@ public class OrderReturnSyncMoneyDetail {
doubleRefund = CalcHelper.sub(doubleRefund, fee);
}
orderMoneyDetailResVo.setReceivableAmount(CalcHelper.sub(orderMoneyDetailResVo.getReceivableAmount(), doubleRefund));
} else {
// orderMoneyDetailResVo.setRefundMoney(CalcHelper.add(orderMoneyDetailResVo.getRefundMoney(), getDoubleWithLongMinute(backAmount)));
// orderMoneyDetailResVo.setReceivableAmount(CalcHelper.sub(orderMoneyDetailResVo.getReceivableAmount(), getDoubleWithLongMinute(backAmount)));
}
temp.getMoneyDetails().add(orderMoneyDetailResVo);
}

2
src/main/java/com/pangding/web/order/service/ret/ticket/check/OrderRefundTicketCheckPdRule.java
View File

@@ -113,7 +113,7 @@ public class OrderRefundTicketCheckPdRule implements OrderRefundTicketCheck {
List<OrderRefundRuleVo> rules = orderRefundRuleDao.loadList(ruleReq, OrderRefundRuleVo.class);
// 胖定来源的退票，必须包含退票规则才能退票，防止绕过系统限制
if (ArrayHelper.getSize(rules) == 0) {
// throw new CodeException("没有退票规则，请先设置退票规则");
throw new CodeException("没有退票规则，请先设置退票规则");
}
return rules;
}

8
src/main/java/com/pangding/web/order/service/ret/ticket/impl/OrderRefundTicketServiceImpl.java
View File

@@ -94,6 +94,14 @@ public class OrderRefundTicketServiceImpl implements OrderRefundTicketService {
List<OrderResVo> orderResVoList = orderDao.loadList(orderReqVo, OrderResVo.class);
if (!StringHelper.isEmpty(orderResVoList) && orderResVoList.size() > 0) {
for (OrderResVo orderResVo : orderResVoList) {
if(OrderConstant.ORDER_STATUS_PART_REFUND == orderResVo.getOrderStatus()
|| OrderConstant.ORDER_STATUS_ALL_REFUND == orderResVo.getOrderStatus()){
// 订单已退，不需要再发起退票了
continue;
}
if(OrderConstant.ORDER_STATUS_REFUNDING == orderResVo.getOrderStatus()){
// 在退款中 不需要再请求退票 查询退款列表 TODO
}
try {
OrderRefundReqVo orderRefundReqVo = new OrderRefundReqVo();
ObjectHelper.writeWithFromClass(orderRefundReqVo, req);

3
src/main/java/com/pangding/web/order/service/ticket/finish/impl/OrderTicketFinishHandleFairRefund.java
View File

@@ -25,6 +25,9 @@ public class OrderTicketFinishHandleFairRefund implements OrderTicketFinishHandl
|| OrderConstant.ORDER_STATUS_FAIL != StringHelper.toInt(fromStatus.getOrderStatus())) {
return;
}
if(order.getPdOrderMoney() == 0){
return;
}
// 需要退票退款
temp.getRetTickets().add(OrderCancelOrderMqHandleRefund.getRefundReq(order, "出票失败，自动退票、退款," + order.getErrorMessage()));
}

2
src/main/java/com/pangding/web/order/vo/request/OrderCountRequest.java
View File

@@ -7,7 +7,7 @@ import java.io.Serializable;
* @date 2019/6/1
* 订单各状态查询类
*/
public class OrderCountRequest implements Serializable {
public class OrderCountRequest {
/**
* 用户ID

1
src/main/java/com/pangding/web/order/web/ReportController.java
View File

@@ -126,6 +126,7 @@ public class ReportController {
// .notBlankCheck("type", reqVo.getType())
.checkException();
if (!"10001".equals(reqVo.getCompanyId())) {
reqVo.setCompanyId("");
}
reqVo.setStartDate(reqVo.getOrderDateStart());
reqVo.setEndDate(reqVo.getOrderDateEnd());