chunping 3 سال پیش
والد
کامیت
4a5a9e26ba

+ 50 - 0
mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/ChannelMoneyController.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
+ *
+ * https://www.mall4j.com/
+ *
+ * 未经允许,不可做商业用途!
+ *
+ * 版权所有,侵权必究!
+ */
+
+package com.qs.mp.web.controller.api.channel;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.qs.mp.channel.domain.ChannelMoneyLog;
+import com.qs.mp.channel.service.IChannelMoneyLogService;
+import com.qs.mp.common.core.page.TableDataInfo;
+import com.qs.mp.utils.SecurityUtils;
+import com.qs.mp.web.controller.common.BaseApiController;
+import io.swagger.annotations.Api;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping("/api/v1/mp/channel")
+@Api(tags = "账户明细接口")
+@AllArgsConstructor
+public class ChannelMoneyController extends BaseApiController {
+
+  @Autowired
+  private IChannelMoneyLogService channelMoneyLogService;
+
+  @RequestMapping(value = "/money/log", method = RequestMethod.POST)
+  @ResponseBody
+  public TableDataInfo listMoneyLog(@RequestBody ChannelMoneyLog channelMoneyLog) {
+    Long channelId = SecurityUtils.getLoginUser().getChannelId();
+    QueryWrapper<ChannelMoneyLog> queryWrapper = new QueryWrapper();
+    queryWrapper.lambda().eq(ChannelMoneyLog::getChannelId, channelId);
+    queryWrapper.lambda().orderByDesc(ChannelMoneyLog::getBizTime);
+    startPage();
+    List<ChannelMoneyLog> list = channelMoneyLogService.list(queryWrapper);
+    return getDataTable(list);
+  }
+}

+ 51 - 0
mp-common/src/main/java/com/qs/mp/common/enums/ChannelMoneyEnum.java

@@ -0,0 +1,51 @@
+package com.qs.mp.common.enums;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.IEnum;
+
+/**
+ * @auther zhongcp
+ * @create 2022 2022/3/7 2:30 下午
+ * @describe
+ */
+public enum ChannelMoneyEnum implements IEnum<Integer> {
+
+  COMMISSION(1, "佣金收入"),
+  WITHDRAW(2, "提现"),
+  WITHDRAW_FEE(3, "提现手续费"),
+  PURCHASE(4, "进票");
+
+
+  private final int value;
+  private final String desc;
+  public static final int INCOME = 1;   //收支类型 1收入
+  public static final int EXPENSES = 0;  //0支出
+
+  ChannelMoneyEnum(int value, String desc) {
+    this.value = value;
+    this.desc = desc;
+  }
+
+  public static ChannelMoneyEnum getChannelMoneyTypeEnum(int value) {
+    for (ChannelMoneyEnum channelMoneyTypeEnum : ChannelMoneyEnum.values()) {
+      if (channelMoneyTypeEnum.getValue() == value) {
+        return channelMoneyTypeEnum;
+      }
+    }
+    return null;
+  }
+
+  @Override
+  public Integer getValue() {
+    return value;
+  }
+
+
+  @Override
+  public String toString() {
+    JSONObject object = new JSONObject();
+    object.put("value", value);
+    object.put("desc", desc);
+    return object.toString();
+  }
+}

+ 5 - 1
mp-service/src/main/java/com/qs/mp/channel/domain/ChannelMoneyLog.java

@@ -1,9 +1,12 @@
 package com.qs.mp.channel.domain;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qs.mp.common.enums.ChannelMoneyEnum;
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
@@ -35,7 +38,8 @@ public class ChannelMoneyLog implements Serializable {
    * 交易类型
    */
   @TableField("type")
-  private Integer type;
+  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
+  private ChannelMoneyEnum type;
 
   /**
    * 交易后账户余额