Merge branch 'dev2'

cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Operators.java

@@ -13,17 +13,18 @@ import lombok.experimental.SuperBuilder;
 @NoArgsConstructor
 @SuperBuilder
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = "orders",autoResultMap = true)
+@TableName(value = "operators",autoResultMap = true)
 public class Operators extends BaseEntity {
 
     /**
      * 运营商ID
      */
-    private Long operators_id;
+
+    private Long operatorsId;
 
     /**
      * 运营商
      */
-    private String operators_name;
+    private String operatorsName;
 
 }

cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OperatorsController.java

@@ -1,13 +1,43 @@
 package com.muyu.cloud.market.controller;
 
+import com.dtflys.forest.springboot.annotation.ForestScannerRegister;
+import com.muyu.cloud.market.domin.Operators;
+import com.muyu.cloud.market.service.OperatorsService;
+import com.muyu.common.core.domain.Result;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.expression.spel.ast.Operator;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @Log4j2
 @RestController
-@RequestMapping("/orders")
+@RequestMapping("/operators")
 @Tag(name = "运营商控制层", description = "进行订单支付所用运营商管理")
 public class OperatorsController {
+    public  OperatorsController() {
+        log.info("forest{} 扫描路径", ForestScannerRegister.getBasePackages());
+    }
+
+    @Autowired
+    private OperatorsService operatorsService;
+
+    @PostMapping("/list")
+    @Operation(summary = "查看运营商")
+    public Result<List<Operators>> selectList (){
+//        return  Result.success(OperatorsService.selectList());
+        return  null;
+    }
+
+
+
+
+
 }

cloud-market-server/src/main/java/com/muyu/cloud/market/service/OperatorsService.java

@@ -3,10 +3,22 @@ package com.muyu.cloud.market.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.cloud.market.domin.Operators;
 
+import java.util.List;
+
 public interface OperatorsService extends IService<Operators> {
 
+  /**
+   * 回显
+   * @param operatorsId
+   * @return
+   */
+  Operators selectfindById (Integer operatorsId);
 
-
+  /**
+   * 列表
+   * @return
+   */
+//  static List<Operators> selectList();
 
 
 

cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OperatorsServiceImpl.java

@@ -2,6 +2,7 @@ package com.muyu.cloud.market.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.cloud.market.domin.Operators;
+import com.muyu.cloud.market.mapper.OperatorsMapper;
 import com.muyu.cloud.market.service.OperatorsService;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
@@ -10,11 +11,23 @@ import java.util.List;
 
 @Service
 @Log4j2
-public class OperatorsServiceImpl
-//        extends ServiceImpl<Operators> implements OperatorsService
+public class OperatorsServiceImpl extends ServiceImpl<OperatorsMapper,Operators> implements OperatorsService
 {
+
+    @Override
+    public Operators selectfindById(Integer operatorsId) {
+
+
+        return null;
+    }
+
 //    @Override
-//    public List<Operators> list() {
-//        return OperatorsService.super.list();
+//    public List<Operators> selectShowlist() {
+//
+//        return null;
+//
 //    }
+
+
+
 }