Merge branch 'refs/heads/dev' into test

share-front/src/main/java/share/web/controller/system/EquityMembersOrderConfigController.java

@@ -5,6 +5,7 @@ import org.springframework.web.bind.annotation.*;
 import share.common.annotation.Log;
 import share.common.core.controller.BaseController;
 import share.common.core.domain.AjaxResult;
+import share.common.core.domain.R;
 import share.common.core.page.TableDataInfo;
 import share.common.enums.BusinessType;
 import share.common.utils.poi.ExcelUtil;
@@ -36,6 +37,12 @@ public class EquityMembersOrderConfigController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/query")
+    public R<List<EquityMembersOrderConfig>> query() {
+        List<EquityMembersOrderConfig> list = equityMembersOrderConfigService.selectEquityMembersOrderConfigList(null);
+        return R.ok(list);
+    }
+
     /**
      * 导出权益会员订单配置列表
      */

share-front/src/main/java/share/web/controller/system/EquityMembersOrderController.java

 package share.web.controller.system;
 
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -109,4 +110,14 @@ public class EquityMembersOrderController extends BaseController {
     public R<Boolean> cancelPay(@RequestParam("equityOrderNo") String equityOrderNo) {
         return R.ok(equityMembersOrderService.cancelPay(equityOrderNo));
     }
+
+
+    /**
+     * 获取订单详细信息
+     */
+    @ApiOperation(value = "通过订单编号查询订单")
+    @GetMapping(value = "/{equityOrderNo}")
+    public R<EquityMembersOrderVo> queryEquityMembersOrderInfoByNo(@PathVariable("equityOrderNo") String equityOrderNo) {
+        return R.ok(equityMembersOrderService.queryEquityMembersOrderInfoByNo(equityOrderNo));
+    }
 }

share-front/src/main/java/share/web/controller/system/RechargeConfController.java

@@ -5,6 +5,7 @@ import org.springframework.web.bind.annotation.*;
 import share.common.annotation.Log;
 import share.common.core.controller.BaseController;
 import share.common.core.domain.AjaxResult;
+import share.common.core.domain.R;
 import share.common.core.page.TableDataInfo;
 import share.common.enums.BusinessType;
 import share.common.utils.poi.ExcelUtil;
@@ -36,6 +37,14 @@ public class RechargeConfController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/query")
+    public R<List<RechargeConf>> query() {
+        List<RechargeConf> list = rechargeConfService.selectRechargeConfList(null);
+        return R.ok(list);
+    }
+
+
+
     /**
      * 导出充值配置列表
      */

share-front/src/main/java/share/web/controller/system/RechargeController.java

 package share.web.controller.system;
 
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -109,4 +110,13 @@ public class RechargeController extends BaseController {
     public R<Boolean> cancelPay(@RequestParam("rechargeNo") String rechargeNo) {
         return R.ok(rechargeService.cancelPay(rechargeNo));
     }
+
+    /**
+     * 获取订单详细信息
+     */
+    @ApiOperation(value = "通过订单编号查询订单")
+    @GetMapping(value = "/{rechargeNo}")
+    public R<RechargeVo> queryRechargeInfoByNo(@PathVariable("rechargeNo") String rechargeNo) {
+        return R.ok(rechargeService.queryRechargeInfoByNo(rechargeNo));
+    }
 }

share-system/src/main/java/share/system/service/EquityMembersOrderService.java

@@ -72,4 +72,6 @@ public interface EquityMembersOrderService extends IService<EquityMembersOrder>
     Boolean cancelPay(String equityOrderNo);
 
     EquityMembersOrder getByEquityOrderNo(String equityOrderNo);
+
+    EquityMembersOrderVo queryEquityMembersOrderInfoByNo(String equityOrderNo);
 }

share-system/src/main/java/share/system/service/RechargeService.java

@@ -72,4 +72,6 @@ public interface RechargeService extends IService<Recharge> {
     Boolean cancelPay(String rechargeNo);
 
     Recharge getByRechargeNo(String rechargeNo);
+
+    RechargeVo queryRechargeInfoByNo(String rechargeNo);
 }

share-system/src/main/java/share/system/service/impl/EquityMembersOrderServiceImpl.java

@@ -210,6 +210,14 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
         return getOne(lqw);
     }
 
+    @Override
+    public EquityMembersOrderVo queryEquityMembersOrderInfoByNo(String equityOrderNo) {
+        EquityMembersOrder en = getByEquityOrderNo(equityOrderNo);
+        EquityMembersOrderVo vo = new EquityMembersOrderVo();
+        BeanUtils.copyProperties(en, vo);
+        return vo;
+    }
+
     private EquityMembersOrder generatEquityMembersOrder(CreateEquityMembersRequest request, SConsumer user) {
         EquityMembersOrder equityMembersOrder = new EquityMembersOrder();
         BeanUtils.copyProperties(request, equityMembersOrder);

share-system/src/main/java/share/system/service/impl/RechargeServiceImpl.java

@@ -195,6 +195,14 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
         return getOne(lqw);
     }
 
+    @Override
+    public RechargeVo queryRechargeInfoByNo(String rechargeNo) {
+        Recharge byRechargeNo = getByRechargeNo(rechargeNo);
+        RechargeVo vo = new RechargeVo();
+        BeanUtils.copyProperties(byRechargeNo, vo);
+        return vo;
+    }
+
     private void extracted(Recharge recharge) {
         //新增会员钱包
         RechargeConf rechargeConf = rechargeConfService.selectRechargeConfById(recharge.getRechargeConfId());