后台需求

lb-module/src/main/java/com/ydd/module/service/impl/MemberBalanceLogServiceImpl.java

@@ -55,6 +55,9 @@ public class MemberBalanceLogServiceImpl extends ServiceImpl<MemberBalanceLogMap
     @Override
     public List<MemberBalanceLog> queryList(MemberBalanceLog memberBalanceLog) {
         LambdaQueryWrapper<MemberBalanceLog> lqw = Wrappers.lambdaQuery();
+        if (memberBalanceLog.getOrderId() != null) {
+            lqw.eq(MemberBalanceLog::getOrderId, memberBalanceLog.getOrderId());
+        }
         if (memberBalanceLog.getMemberId() != null) {
             lqw.eq(MemberBalanceLog::getMemberId, memberBalanceLog.getMemberId());
         }

lb-web/src/main/java/com/ydd/web/controller/MemberBalanceLogController.java

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydd.common.core.domain.entity.SysUser;
 import com.ydd.common.core.page.PageResult;
 import com.ydd.common.enums.UserTypeEnums;
+import com.ydd.module.domain.Order;
 import com.ydd.module.enums.PaymentTypeEnum;
+import com.ydd.module.service.IOrderService;
 import com.ydd.module.service.IRechargeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -43,12 +45,18 @@ public class MemberBalanceLogController extends BaseController {
 
     private final IRechargeService iRechargeService;
 
+    private final IOrderService iOrderService;
+
     /**
      * 查询用户账户明细列表
      */
 //    @PreAuthorize("@ss.hasPermi('module:memberBalanceLog:list')")
     @GetMapping("/list")
     public TableDataInfo list(MemberBalanceLog memberBalanceLog) {
+        if(memberBalanceLog.getOrderSn() != null) {
+          Order order = iOrderService.getByOrderSn(memberBalanceLog.getOrderSn());
+          memberBalanceLog.setOrderId(order.getId());
+        }
         startPage();
         List<MemberBalanceLog> list = iMemberBalanceLogService.queryList(memberBalanceLog);
         return getDataTable(list);

web-ui/src/views/module/memberBalanceLog/index.vue

@@ -26,6 +26,14 @@
           :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="订单号" prop="orderSn">
+        <el-input
+          v-model="queryParams.orderSn"
+          placeholder="请输入订单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
@@ -41,18 +49,21 @@
         </template>
       </el-table-column>
       <el-table-column label="描述" align="center" prop="remark" />
+      <el-table-column label="订单号" align="center" prop="orderSn"></el-table-column>
       <el-table-column label="来源" align="center" prop="source">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.source == 1">充值</el-tag>
           <el-tag type="success" v-if="scope.row.source == 2">消费</el-tag>
           <el-tag type="danger" v-if="scope.row.source == 3">退款</el-tag>
           <el-tag type="primary" v-if="scope.row.source == 4">赠送</el-tag>
+          <el-tag type="info" v-if="scope.row.source == 5">补贴</el-tag>
+          <el-tag type="danger" v-if="scope.row.source == 6">订单退款</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="变动金额" align="center" prop="amount" />
       <el-table-column label="变动时间" align="center" prop="createTime" />>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -118,6 +129,12 @@ export default {
       },{
         value: 4,
         name: '赠送'
+      },{
+        value: 5,
+        name: '补贴'
+      },{
+        value: 6,
+        name: '订单退款'
       }],
       // 遮罩层
       loading: true,
@@ -149,7 +166,9 @@ export default {
         amount: undefined,
         merchantId: undefined,
         startTime: undefined,
-        endTime: undefined
+        endTime: undefined,
+        showOther: false,
+        orderSn: undefined
       },
       // 表单参数
       form: {},
@@ -171,15 +190,17 @@ export default {
     };
   },
   created() {
-    if(this.$route.query.id != undefined && this.$route.query.id != null) {
-      this.queryParams.memberId = this.$route.query.id
-      console.log('memberId', this.$route.query.id)
-      this.getList();
-    }
+
   },
   methods: {
-    init(id) {
-      this.queryParams.merchantId = id;
+    // type明细类型(0:商家，1:用户)
+    init(id, type) {
+      if(type == 1) {
+        this.queryParams.memberId = id;
+      }else {
+        this.queryParams.merchantId = id;
+      }
+
       this.getList()
     },
     /** 查询用户账户明细列表 */