zangbin 3 年之前
父节点
当前提交
f28e1add09

+ 10 - 0
lb-module/src/main/java/com/ydd/module/dto/DadaDspWithdrawalDto.java

@@ -75,4 +75,14 @@ public class DadaDspWithdrawalDto implements Serializable {
      * 开户行
      */
     private String bankName;
+
+    /**
+     * 提现前账户总金额
+     */
+    private BigDecimal beforeAmount;
+
+    /**
+     * 提现后账户总金额
+     */
+    private BigDecimal afterAmount;
 }

+ 1 - 1
lb-module/src/main/resources/mapper/module/DadaDspWithdrawalMapper.xml

@@ -50,7 +50,7 @@
         ddw.zfb_name,
         ddw.remark,
         dd.name,
-        dd.before_amount
+        ddw.before_amount
         from lb_dada_dsp_withdrawal ddw left join lb_dada_dsp dd on ddw.dada_dsp_id = dd.id
         where 1 = 1
         <if test='params.status != null and params.status != ""'>

+ 1 - 1
web-ui/src/views/module/merchant/dadaVerify.vue

@@ -51,7 +51,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-           v-if="(userType == 4 || userType == 5 || userType == 1) && scope.row.status != 1"
+           v-if="(userType == 4 || userType == 5 || userType == 1 || userType == 3) && scope.row.status != 1"
             size="mini"
             type="text"
             icon="el-icon-edit"