Sfoglia il codice sorgente

1.提现审核功能调整

wuhp 2 anni fa
parent
commit
a77f39a0f7

+ 29 - 0
src/main/java/com/ydtech/constants/enums/dict/AuditingStatusEnum.java

@@ -0,0 +1,29 @@
+package com.ydtech.constants.enums.dict;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.ydtech.aop.request.DictEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@DictEnum(key = "pay_status", desc = "提现金额类型")
+public enum AuditingStatusEnum implements IBaseEnum{
+
+
+
+    PS1("1","手续费佣金",1,0),
+    PS2("2","非跟单佣金",2,0),
+    PS3("3","推广佣金",3,0);
+
+
+    // 编号
+    private final String code;
+    // 说明
+    private final String desc;
+    // 排序
+    private final Integer sort;
+    // 状态  0 启用  1 不启用
+    private final Integer status;
+
+}

+ 2 - 2
src/main/java/com/ydtech/modules/admin/service/impl/SysAmountAuditingServiceImpl.java

@@ -49,11 +49,11 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
                     } else if ("2".equals(amountStatus)) {
                         BigDecimal documentary = sysUserAccount.getDocumentary();
                         BigDecimal afterAmount = documentary.subtract(amount);
-                        sysUserAccountEntity.setHandlingFee(afterAmount);
+                        sysUserAccountEntity.setDocumentary(afterAmount);
                     } else {
                         BigDecimal promotion = sysUserAccount.getPromotion();
                         BigDecimal afterAmount = promotion.subtract(amount);
-                        sysUserAccountEntity.setHandlingFee(afterAmount);
+                        sysUserAccountEntity.setPromotion(afterAmount);
                     }
                 }
                 sysUserAccountService.updateById(sysUserAccountEntity);

+ 0 - 1
src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml

@@ -79,7 +79,6 @@
                 and a.create_time BETWEEN #{sysAmountAuditingVo.startTime} AND #{sysAmountAuditingVo.endTime}
             </if>
         </where>
-            order by  a.create_time
 
     </select>