From e60572581d3a8b97bb8cc35536daaa7b3f2c0a14 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 22 十一月 2022 13:57:33 +0800
Subject: [PATCH] #feat 调试修改问题
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java | 201 ++++++--------------------------------------------
1 files changed, 25 insertions(+), 176 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
index 28e0a67..2263cc8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
@@ -19,15 +19,10 @@
@Resource
private ComShopFlowerGoodsService comShopFlowerGoodsService;
- // @Resource
-// private ComShopOperLogService comShopOperLogService;
@Resource
private ComShopFlowerOrderService comShopFlowerOrderService;
- // @Resource
-// private ComShopCartService comShopCartService;
@Resource
private ComShopFlowerUserAddressService comShopUserAddressService;
-
@Resource
private ConvenientMerchantService convenientMerchantService;
@Resource
@@ -36,6 +31,8 @@
private ComShopFlowerOrderDeliveryService comShopFlowerOrderDeliveryService;
@Resource
private ComShopFlowerRefundOrderService comShopFlowerRefundOrderService;
+ @Resource
+ private ComShopFlowerOrderPayService comShopFlowerOrderPayService;
/**
@@ -484,187 +481,39 @@
* @return
*/
@GetMapping("selectCountGroupStatus")
- public R selectCountGroupStatus(Long storeId){
+ public R selectCountGroupStatus(@RequestParam("storeId") Long storeId){
return comShopFlowerRefundOrderService.selectCountGroupStatus(storeId);
}
+ /**
+ * 新增商品浏览量
+ * @param goodsId
+ * @return
+ */
+ @GetMapping("incrGoodsView")
+ public R incrGoodsView(@RequestParam("goodsId") Long goodsId){
+ return comShopFlowerGoodsService.incrGoodsView(goodsId);
+ }
/**
- * 统计用户订单数量
- *
- * @param userId
- * 用户id
- * @return 统计结果
+ * 出入账分页
+ * @param pageComShopFlowerOrderPayDTO
+ * @return
*/
-/* @PostMapping("orderStatistics")
- public R orderStatistics(@RequestParam("userId") Long userId) {
- return comShopOrderService.orderStatistics(userId);
- }*/
-
-
- /*
-
-
- *//**
- * 根据店铺id查询店铺详情
- *
- * @param comShopStoreDTO
- * 请求参数
- * @return 店铺详情
- *//*
- @PostMapping("shopStoreDetail")
- public R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO) {
- return comShopStoreService.shopStoreDetail(comShopStoreDTO);
+ @PostMapping("pageOrderPay")
+ public R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO){
+ return comShopFlowerOrderPayService.pageOrderPay(pageComShopFlowerOrderPayDTO);
}
-
-
-
-
- *//**
- * 商家资金的订单详情
- *
- * @param id
+ /**
+ * 获取商家的营业额和可结算金额
+ * @param storeId
* @return
- *//*
- @GetMapping("capitalDetailByStore")
- public R capitalDetailByStore(@RequestParam("id") Long id) {
- return comShopOrderService.capitalDetailByStore(id);
+ */
+ @GetMapping("getQuota")
+ public R getQuota(@RequestParam("storeId") Long storeId){
+ return comShopFlowerOrderService.getQuota(storeId);
}
-
-
-
- *//**
- * 订单导出信息
- *
- * @param comShopOrderExportDTO
- * 订单导出信息
- * @return 订单导出信息
- *//*
- @PostMapping("/shopOrderExportData")
- R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO) {
- return comShopOrderService.shopOrderExportData(comShopOrderExportDTO);
- }
-
- *//**
- * 资金管理导出信息
- *
- * @param comShopFundsExportDTO
- * 资金管理导出信息
- * @return 资金管理导出信息
- *//*
- @PostMapping("/shopOrderFundsExportData")
- R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO) {
- return comShopOrderService.shopOrderFundsExportData(comShopFundsExportDTO);
- }
-
- *//**
- * 用户资金统计信息
- *
- * @param userId
- * 用户ID
- * @return 统计信息
- *//*
- @GetMapping("/getFundsStat")
- R getFundsStat(@RequestParam("userId") Long userId) {
- return comShopOrderService.getFundsStat(userId);
- }
-
- *//**
- * 店铺资金统计信息
- *
- * @param pageComShopFundsSearchDTO
- * 店铺资金
- * @return 店铺资金统计信息
- *//*
- @PostMapping("/pageShopFunds")
- R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO) {
- return comShopOrderService.pageShopFunds(pageComShopFundsSearchDTO);
- }
-
- *//**
- * 微信支付订单回调
- *
- * @param wxPayNotifyOrderDTO
- * 订单支付回调参数
- *//*
- @PostMapping("/wxOrderPayNotify")
- public void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO) {
- comShopOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
- }
-
- *//**
- * 点击去支付订单
- *
- * @param orderPayDTO
- * 请求参数
- * @return 支付对象
- *//*
- @PostMapping("/wxPay")
- public R wxPay(@RequestBody OrderPayDTO orderPayDTO) {
- return comShopOrderService.wxPay(orderPayDTO);
- }
-
- *//**
- * 商城系统配置
- *
- * @param comShopSysConfDTO
- * @return
- *//*
- @PostMapping("/conf/edit")
- R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO) {
- ComShopSysConfDO comShopSysConfDO = comShopSysConfService.getBaseMapper().selectById(comShopSysConfDTO.getId());
- switch (comShopSysConfDTO.getHidden()) {
- case 0:
- comShopSysConfDO.setVal("0");
- comShopSysConfDO.setEnabled("1");
- break;
- case 1:
- comShopSysConfDO.setVal("1");
- comShopSysConfDO.setEnabled("1");
- break;
- default:
- break;
- }
- int updated = comShopSysConfService.getBaseMapper().updateById(comShopSysConfDO);
- if (updated == 1) {
- return R.ok();
- }
- return R.fail();
- }
-
- *//**
- * 商城系统配置查询
- *
- * @param pageComShopSysConfDTO
- * @return
- *//*
- @PostMapping("/conf/get")
- R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO) {
- List<ComShopSysConfDO> confList =
- comShopSysConfService.getBaseMapper().selectList(new LambdaQueryWrapper<ComShopSysConfDO>()
- .eq(ComShopSysConfDO::getName, "SHOP_HIDDEN").orderByDesc(ComShopSysConfDO::getCreate_at));
- ComShopSysConfVO comShopSysConfVO = new ComShopSysConfVO();
- if (confList != null && confList.size() > 0) {
- ComShopSysConfDO firstConf = confList.get(0);
- BeanUtils.copyProperties(firstConf, comShopSysConfVO);
- return R.ok(comShopSysConfVO);
- }
- return R.ok();
- }
-
- *//**
- * check商家/店铺是否有效
- * @param userId
- * @return
- *//*
- @GetMapping("/checkStoreIsValid")
- public R checkStoreIsValid(@RequestParam("userId") Long userId) {
- Boolean isShopValid = comShopStoreService.checkStoreIsValid(userId);
- Boolean isConvenientValid = convenientMerchantService.checkStoreIsValid(userId);
- Boolean isMcsValid = userService.checkUserIsValid(userId, 11);
- return R.ok(isShopValid || isConvenientValid || isMcsValid);
- }*/
}
--
Gitblit v1.7.1