소스 검색

线下收款账号配置

huangzhiguo 2 년 전
부모
커밋
94bae0d9a3

+ 4 - 3
src/main/java/com/caimei365/order/controller/ReceiptApi.java

@@ -19,6 +19,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -35,7 +36,7 @@ import java.util.Map;
 public class ReceiptApi {
     private final ReceiptService receiptService;
 
-    private cmOfflineCollectionService collectionService;
+    @Resource private cmOfflineCollectionService collectionService;
 
     /**
      * 线下收款用户微信授权
@@ -92,7 +93,7 @@ public class ReceiptApi {
      */
     @ApiOperation("获取收款类型")
     @GetMapping("/type")
-    public ResponseJson<List<ReceiptTypeVo>> getReceiptType() {
+    public ResponseJson<List<cmOfflineCollectionVo>> getReceiptType() {
         return receiptService.getReceiptType();
     }
 
@@ -101,7 +102,7 @@ public class ReceiptApi {
      * @return
      */
     @ApiOperation("获取银行账户配置信息")
-    @PostMapping("/bankData")
+    @GetMapping("/bankData")
     public ResponseJson<cmOfflineCollectionPo> selectData() {
 
         return collectionService.seData();

+ 1 - 1
src/main/java/com/caimei365/order/mapper/ReceiptMapper.java

@@ -55,7 +55,7 @@ public interface ReceiptMapper {
     /**
      * 获取收款类型列表
      */
-    List<ReceiptTypeVo> getReceiptType();
+    List<cmOfflineCollectionVo> getReceiptType();
 
     /**
      * 获取收款类型

+ 4 - 0
src/main/java/com/caimei365/order/mapper/cmOfflineCollectionMapper.java

@@ -11,5 +11,9 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface cmOfflineCollectionMapper {
+    /**
+     * 获取后台配置显示的银行信息
+     * @return
+     */
     cmOfflineCollectionPo seData();
 }

+ 16 - 0
src/main/java/com/caimei365/order/model/vo/cmOfflineCollectionVo.java

@@ -0,0 +1,16 @@
+package com.caimei365.order.model.vo;
+
+import lombok.Data;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2022/9/26
+ */
+@Data
+public class cmOfflineCollectionVo {
+
+    private Integer id;             // id
+    private String type;           // 银行名称
+}

+ 1 - 1
src/main/java/com/caimei365/order/service/ReceiptService.java

@@ -39,7 +39,7 @@ public interface ReceiptService {
     /**
      * 获取收款类型
      */
-    ResponseJson<List<ReceiptTypeVo>> getReceiptType();
+    ResponseJson<List<cmOfflineCollectionVo>> getReceiptType();
 
     /**
      * 识别收款短信

+ 3 - 0
src/main/java/com/caimei365/order/service/cmOfflineCollectionService.java

@@ -10,5 +10,8 @@ import com.caimei365.order.model.po.cmOfflineCollectionPo;
  * @date : 2022/9/26
  */
 public interface cmOfflineCollectionService {
+    /**
+     *获取后台配置显示的银行信息
+     */
     ResponseJson<cmOfflineCollectionPo> seData();
 }

+ 2 - 2
src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -177,8 +177,8 @@ public class ReceiptServiceImpl implements ReceiptService {
      * 获取收款类型
      */
     @Override
-    public ResponseJson<List<ReceiptTypeVo>> getReceiptType() {
-        List<ReceiptTypeVo> list = receiptMapper.getReceiptType();
+    public ResponseJson<List<cmOfflineCollectionVo>> getReceiptType() {
+        List<cmOfflineCollectionVo> list = receiptMapper.getReceiptType();
         return ResponseJson.success(list);
     }
 

+ 5 - 1
src/main/java/com/caimei365/order/service/impl/cmOfflineCollectionServiceImpl.java

@@ -19,12 +19,16 @@ public class cmOfflineCollectionServiceImpl implements cmOfflineCollectionServic
 
     @Resource private cmOfflineCollectionMapper cmOfflineCollectionMapper;
 
+    /**
+     * 获取后台配置显示的银行信息
+     * @return
+     */
     @Override
     public ResponseJson<cmOfflineCollectionPo> seData() {
         cmOfflineCollectionPo collectionPo = cmOfflineCollectionMapper.seData();
         if (collectionPo.getId() == null) {
             return ResponseJson.error("银行账户查询失败,请联系管理员");
         }
-        return ResponseJson.success();
+        return ResponseJson.success(collectionPo);
     }
 }

+ 2 - 2
src/main/resources/mapper/ReceiptMapper.xml

@@ -181,8 +181,8 @@
         FROM cm_receipt_user_permission
         WHERE user_id = #{userId}
     </select>
-    <select id="getReceiptType" resultType="com.caimei365.order.model.vo.ReceiptTypeVo">
-        SELECT type, bankAccount FROM  cm_offline_collection ORDER BY id
+    <select id="getReceiptType" resultType="com.caimei365.order.model.vo.cmOfflineCollectionVo">
+        SELECT type as id, bankAccount as type FROM  cm_offline_collection ORDER BY id
     </select>
     <select id="getReceiptTypeById" resultType="com.caimei365.order.model.vo.ReceiptTypeVo">
         SELECT `id`, `type`