autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 03:25:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into merge_adapay

Browse Source 
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
This commit is contained in:
autumn.g@foxmail.com
2023-08-29 17:03:24 +08:00
parent ae578eada7 a90fc4f9f3
commit 90539edf60
26 changed files with 468 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -23,6 +23,8 @@ import com.jsowell.common.enums.AcquirerEnum;
import com.jsowell.common.enums.InvoiceRecordEnum;
import com.jsowell.common.enums.MemberWalletEnum;
import com.jsowell.common.enums.adapay.AdapayEventEnum;
import com.jsowell.common.enums.uniapp.OccupyOrderPayStatusEnum;
import com.jsowell.common.enums.uniapp.OccupyOrderStatusEnum;
import com.jsowell.common.enums.ykc.*;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.DateUtils;
@@ -1074,6 +1076,15 @@ public class OrderService {
dto.setSubType(MemberWalletEnum.SUBTYPE_TOP_UP.getValue());
dto.setUpdatePrincipalBalance(amount);
memberBasicInfoService.updateMemberBalance(dto);
} else if (StringUtils.equals(type, ScenarioEnum.OCCUPY.getValue())) { // 占桩订单
// 通过订单号查询出占桩订单信息
OrderPileOccupy orderPileOccupy = orderPileOccupyService.queryByOccupyCode(orderCode);
// 订单状态改为 1-订单完成
orderPileOccupy.setStatus(OccupyOrderStatusEnum.ORDER_COMPLETE.getCode());
// 支付状态改为 1-支付完成
orderPileOccupy.setPayStatus(OccupyOrderPayStatusEnum.PAYMENT_COMPLETION.getCode());
orderPileOccupyService.updateByPrimaryKey(orderPileOccupy);
}
}

11
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java
View File

@@ -103,6 +103,17 @@ public class SettleOrderReportController extends BaseController {
return AjaxResult.success(settleOrderReportService.getMerchantOrderReport(dto));
}
/**
* 查询运营商订单报表V2
* @param dto
* @return
*/
// @PreAuthorize("@ss.hasPermi('pile:merchant:query')")
@PostMapping("/getMerchantOrderReportV2")
public AjaxResult getMerchantOrderReportV2(@RequestBody MerchantOrderReportDTO dto) {
return AjaxResult.success(settleOrderReportService.getMerchantOrderReportV2(dto));
}
/**
* 查询站点订单日报详情
* http://localhost:8080/order/report/getStationOrderReportDetail