123

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/constant/enumerate/CompanyWalletSourceEnum.java

+package com.github.wxiaoqi.security.admin.constant.enumerate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum CompanyWalletSourceEnum {
+
+    VEHICLE(1, "商家订单"),
+    WATER(2, "上级商家拥金"),
+    VIOLATE(3, "违约金"),
+    REGULATION(4, "违章补偿"),
+    LOSS(5, "定损"),
+    CATH(6, "提现"),
+    ;
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    public static Map<Integer, CompanyWalletSourceEnum> codeAndDesc = new HashMap<Integer, CompanyWalletSourceEnum>();
+            //Maps.newHashMap();
+
+    static{
+        for(CompanyWalletSourceEnum enumE : CompanyWalletSourceEnum.values()){
+            codeAndDesc.put(enumE.getCode(), enumE);
+        }
+    }
+
+    CompanyWalletSourceEnum(Integer code, String desc){
+        this.code=code;
+        this.desc=desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public static Boolean exists(Integer code){
+        return codeAndDesc.containsKey(code);
+    }
+
+    public static CompanyWalletSourceEnum get(Integer code) {
+        for(CompanyWalletSourceEnum enumE : CompanyWalletSourceEnum.values()) {
+            if (enumE.getCode().equals(code)) {
+                return enumE;
+            }
+        }
+        return null;
+    }
+}
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/CompanyWalletDetailBiz.java

@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import cn.hutool.json.JSONObject;
 import com.github.wxiaoqi.security.admin.constant.enumerate.CompanyWalletITypeEnum;
+import com.github.wxiaoqi.security.admin.constant.enumerate.CompanyWalletSourceEnum;
 import com.github.wxiaoqi.security.admin.dto.BaseOrderAcceptDetailedDTO;
 import com.github.wxiaoqi.security.admin.dto.OrderWaterDTO;
 import com.github.wxiaoqi.security.admin.dto.WalletDetailDTO;
@@ -16,7 +17,6 @@ import com.github.wxiaoqi.security.common.util.CollectorsUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.github.wxiaoqi.security.admin.entity.CompanyWallet;
-import com.xxfc.platform.order.contant.enumerate.CompanyWalletSourceEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/CompanyWalletSourceEnum.java

@@ -5,12 +5,14 @@ import java.util.Map;
 
 public enum CompanyWalletSourceEnum {
 
-    VEHICLE(1, "商家订单"),
-    WATER(2, "上级商家拥金"),
-    VIOLATE(3, "违约金"),
-    REGULATION(4, "违章补偿"),
-    LOSS(5, "定损"),
-    CATH(6, "提现"),
+    CLOSED_VEHICLE(1, "收车服务费"),
+    DAMAGE_SAFE(2, "不计免赔费"),
+    RENT_VEHICLE(3, "车辆租赁费"),
+    ORDER_COMSSION(4, "订单抽成"),
+    PLATFORM_COMSSION(5, "平台抽成"),
+    LOSS_SPECIFIED(6, "定损费"),
+    BREAK_RULES_REGULATION(7, "违章费"),
+    VIOLATE_AMOUNT(8, "违约金"),
     ;
     /**
      * 编码