getPrefixToFileUrl

基础设置	移动端
商超管理	营业收入
商超管理	营业收入

bonus-common-biz/src/main/java/com/bonus/common/houqin/constant/OrgDelFlagEnum.java

@@ -0,0 +1,22 @@
+package com.bonus.common.houqin.constant;
+
+public enum OrgDelFlagEnum {
+   DEL_FALSE(0, "正常"),
+   DEL_TRUE(2, "删除");
+
+   private final Integer key;
+   private final String value;
+
+   private OrgDelFlagEnum(Integer key, String value) {
+      this.key = key;
+      this.value = value;
+   }
+
+   public Integer key() {
+      return this.key;
+   }
+
+   public String value() {
+      return this.value;
+   }
+}

bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/rabbit/RabbitListenerConfiguration.java

@@ -42,8 +42,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 //@Configuration
-public class RabbitListenerConfiguration  {
-   //implements RabbitListenerConfigurer
+public class RabbitListenerConfiguration implements RabbitListenerConfigurer {
    private static final Logger log = LoggerFactory.getLogger(RabbitListenerConfiguration.class);
    public static final String REDELIVERED_TIMES_HEADER_NAME = "__redelivered_times";
    public static final String ORG_DESTINATION = "__org_destination";

bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/LeRequest.java

@@ -1,69 +0,0 @@
-package com.bonus.common.houqin.utils;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.Valid;
-
-public class LeRequest<T> {
-   @ApiModelProperty("版本控制")
-   private String version;
-   @ApiModelProperty("随机字符串")
-   private String nonceStr;
-   @ApiModelProperty("时间戳")
-   private String timestamp;
-   @ApiModelProperty("签名类型")
-   private String signType;
-   @ApiModelProperty("业务参数")
-   private @Valid T content;
-   @ApiModelProperty("签名")
-   private String sign;
-
-   public String getVersion() {
-      return this.version;
-   }
-
-   public String getNonceStr() {
-      return this.nonceStr;
-   }
-
-   public String getTimestamp() {
-      return this.timestamp;
-   }
-
-   public String getSignType() {
-      return this.signType;
-   }
-
-   public T getContent() {
-      return this.content;
-   }
-
-   public String getSign() {
-      return this.sign;
-   }
-
-   public void setVersion(final String version) {
-      this.version = version;
-   }
-
-   public void setNonceStr(final String nonceStr) {
-      this.nonceStr = nonceStr;
-   }
-
-   public void setTimestamp(final String timestamp) {
-      this.timestamp = timestamp;
-   }
-
-   public void setSignType(final String signType) {
-      this.signType = signType;
-   }
-
-   public void setContent(final T content) {
-      this.content = content;
-   }
-
-   public void setSign(final String sign) {
-      this.sign = sign;
-   }
-
-}

bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/SM4EncryptUtils.java

@@ -8,6 +8,7 @@ import cn.hutool.crypto.Padding;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.SmUtil;
 import cn.hutool.crypto.symmetric.SM4;
+import com.bonus.common.core.utils.encryption.Sm4Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,41 +27,20 @@ public class SM4EncryptUtils {
 
    public static String sm4Encrypt(String data) {
       try {
-         return SmUtil.sm4(SecureUtil.decode(properties.getSm4Key())).encryptBase64(data) + "##encrypted";
+         return data = Sm4Utils.encrypt(data);
       } catch (Exception var2) {
          log.debug("SM4加密异常:{}", var2.getMessage());
          return data;
       }
    }
 
-   public static String sm4Encryptbyconfig(String data) {
-      try {
-         return properties.isEncrypted() ? SmUtil.sm4(SecureUtil.decode(properties.getSm4Key())).encryptBase64(data) + "##encrypted" : data;
-      } catch (Exception var2) {
-         log.debug("SM4加密异常:{}", var2.getMessage());
-         return data;
-      }
-   }
-
-   public static String desensitizedByConfig(String data, DesensitizedUtil.DesensitizedType desensitizedType) {
-      try {
-         if (properties.isDesensitization()) {
-            return data.endsWith("##encrypted") ? DesensitizedUtil.desensitized(sm4Decrypt(data), desensitizedType) : DesensitizedUtil.desensitized(data, desensitizedType);
-         } else {
-            return data;
-         }
-      } catch (Exception var3) {
-         log.debug("脱敏异常:{}", var3.getMessage());
-         return data;
-      }
-   }
-
    public static String sm4Decrypt(String data) {
       try {
          if (data.endsWith("##encrypted")) {
             data = data.substring(0, data.length() - "##encrypted".length());
             return SmUtil.sm4(SecureUtil.decode(properties.getSm4Key())).decryptStr(data);
          } else {
+            data = Sm4Utils.decrypt(data);
             return data;
          }
       } catch (Exception var2) {
@@ -71,15 +51,15 @@ public class SM4EncryptUtils {
 
    public static void main(String[] args) {
 //      System.out.println(sm4Encrypt("18110922397"));
-//      System.out.println(sm4Decrypt("J1KE3IyZqIqgWk09Z2gWpQ==##encrypted"));
+//      System.out.println(sm4Decrypt("GKwQwyM8ltMF7hDQo0VlIw==##encrypted"));
 //
 //      System.out.println(sm4Encrypt("13866134935"));
 //      System.out.println(sm4Decrypt("29G1AUHDmLvPe1tt0t12Dw==##encrypted"));
 
-      String src = decryptBySm4("eNAwpvN8VcbRXal9POGGV5X5y4Pa9oPNn8ewmFkmn9q/EQavDKPbUSpHRc9iI8Yu\n",
+      String src = decryptBySm4("4z487AdShRtt4UB3HOhEdoaC5j5C3ssXfI+T4UHDV3Ne0tiWlfT9VgQjyMY2bz4J\n",
               Base64Decoder.decode("StqtdHhleMKClUGbmBqdrg=="));
       System.out.println(src);
-      String src1 = decryptBySm4("Bkv90NIOHy70kV/ex7l6gaNx7Ir+L61MXjuTr55tXpRZtOOX8XKXqMqBAjBbGLLTlEBycUwDSHAq0Ndu6cEIOyqGLK5ClvqZjWiL/iwPnQ+IEEqA6uV4rWzFtNa9NanlpIo6kzNCXzxiQgFOxgHmI+8Sw8cAyzN7bKZ2dryLQLUD+B68YHwGnGKYuQObIebCPj/wIO1UhoTp9WZqLHog+JTF72cG4nd45JV1xsCbeV8zljplgDlzogWXwhyZHiaphu2O7Si2yfz9/7sIZNyHSF+3SW1OuBgobS5Ia3oxCsKQP+PeJt3P/iPULVJiJDssGVIdFUg9sLkkP6DluszK2T5BMInEutLwqtwwopX97uFLhisKr1LqTKODbnbMWPvJ5hL4GivwWNJVKvBqoYjN7UhupWcTvTAUsd4P0B9rECRB0zut2M2VbkmyQmZsgxoiU5mYoEaoxYunkShHeFZEv6aMpACa9M++7eOk6IAs4b4TUbTV75omnpa7H2g6mR+RKCN0oLhDmJ2LHmsJx/0nZsBmKiKZOTPpGJYJPmxVLT9SZPor2Bj7mO/KK5Hbzklbqn4Lv9l6nx3Xmrjs+LGighfMCBQQyPK2gwJDZapnhphkbTeFY50V60XVdvOZIPCiDzqAm/CkF7NuVSUSy0M24Kd9kYl3Sx+b4v3qTmT0zgaFHiHmkrooz/r1T5pLi3U5/OFAs0gTtYw+KH+hYlFJiAtNm47mBYBCECPfAlB0o1qdluMRDV5L/jv3Pa6hVUgUWhvxnhkX9lEcZgoirqRX6dTYFxYIC/oanmG+CYUnsc7vclvMwzIiDLDt1G6/U0a/hxwIo+kyYvH0EkaFPuT7/9t/hFOjAKfPRUpSzTP+2R6X92meYSMLsUodjW+YaiLre13mMyJ9XUhEnwXn1LxZS8w6L1HIa20UwQ+D6kSWgVp4BpSsAbATKXD5pe650Ky46RIhyEn9cIe0uTOjyoGeQG35so0ChJQE1aCUbipR6wm1THMl8ZqFBkPBQrj+TxvmweNMh99zzqiOeuUPdK4YSthCEzXR7Quby0IxN0pnTIs0Z+FCVdp6pEWoQaRhwIrXZ+bVjRH9XAD7lZbG7Ns2ZfNxah+iIOFdFA4xR/wEXF+31HUXAp+yZqZ61g7lBfhOO7wxyeqUAKlI897G8VpgU2APlwBfTVMTMFwx4HAA9basU6mZcS5UdP8MPJf3ChX25SbYVM3mJvZhdLyD4PoXhuRSQxp3JVgRwlKHEfwSqloGC1fm4WF53fdtHJGl4IIaBeMpoXNWddRe/YTRvi5ljl5Wrhidvu7xkDMXe8WyRQFEsRCR9vbv1z41guFb9bWCh5xbDdy9hQ2dV5J0j2JJnd+LmKf6Fv03Xz8kXxPkpONMVLSk1414P2gdavTgVBFqKKZORdhCCJXPgNy9dZ6ceL/SHG3rgoo8fz/BLhIvtW3OP3Kk+K1hTiKpFnZSc2iKXYRpK2nFikvN/glEgO8xeMtW/Zw3Uz3RhhP0Coqqne4yeNUnBSQLDPkNzoApj2fb983OERVfzs/dcnipJcLhgXFfvbg6vZwHg03EUQ5LALJmjCnJKG0Ubtxe0WPrnFuKafGv8A0RJ4m2kjaMm3M7VEnkNMUpX15RZt6Tm3KWMYejvMMfrTb+hBqFRYhDQ7gK8p2PgK+CuKfAFLWXva3TRI8R09EPqj49kQDHBSMpNgAVRf+3xByImQBufYr37z18ZkEb3ObhWHmc3krdgjJOVmu0sSUz/orEtaxh6CgJh36BQy4tg4Zs2SncFxTTDht84kH1+UJkl3BptHEZvo7pyRVmmCoRgHXSoB+fgNj0spgt/rWkId5KtuLf4L497qoGGMv24G7dElFJq4nrQmn12c76DvELpzKveNffMX/PDCVCqF2NuVH5scEMRt/RjikICzMkh/93L6QhuP/KuBYlisxNWAg3kTp7JE4gS8hoFN6YxMRNPVMAX3zY0DDr6Z4rbObCcnIrHpQGwcofPbpIhJsPxIn7Slig7SFWR9EBfiW5F7TxrF4WVYMowcWKsBJPcn6BHcjljdQ5KFtMFjt6suJxOEjcXl/8CQewd8jZ9uEyzyE6q+sWB4t7rxt7xVOswrLBXZncXdZVi3/a4HvJ46y8ev7I6IBVcvfSEAXQyt0Jny2M5lTlBUOHPmDzU18nYPSkSQmDlbk01XfjOwk0gYgSaCaBpADFYXviw3+8FdKHz46ijLt82X3gzxQDFbEa4iBDFy+z6COprPOuHNviqirh3NGyyGDyohgAaWyGNERxhtxY5WBq21B5ULXRFoRks1ai24NKcDU3EaeorD1hrabdbQ674Mx64y6siaDv2k7wfK7B8nEbnJoVoB1Nvd/9NmCT6sW+HHoqTQGX0pyV7TJYkvK2orUcfGXd/3GQ8G2xTLKrS6TZkPGtZnk+bumWjS1XVSLILFaEc1278p7Uu+lPrnLl/6gdJRO744IUFKfHzdpNAcXcQIhg/YBEKGVy/fNa0VrrFinsmZ/aan+ZropwYqx1YOoeNwzYBSogKP3rdHLO38xcCpqxMtfTDwFdvxBEiMyjRel4HETzo2H1PAmv20ZhoFCCc7Gha/mMUgCnMiuR7EbKPj9tihE7mMPZn00hbZ+5wubdqS6A7AAOUKp2Ns3sDZC/qDm7F4aYZThYWH8mx7oWPngwM9omVLsvy/04IUH8LuJZeGp5H2Bc/MqNMAV34hDa6scIiW5iQn4=",
+      String src1 = decryptBySm4("miU+rUiYcrDot9bCuiISB1Xepg7ROsxyVDx9FfcO8L5uGZ7ixXPhAAbTj1Rp5qAB9w70qiCWhO4Gzx/hz2kRgsbnbvBeVEPRNRonRYJH4oPv2kC4v8Ha4tKbpy8WMNUyx4fqKRmX4wArqnwOkOQ1NEM/+cD10BmUUWvsbH/DJqTnrEQasrKmN0l/3Y49OfcJ+e0dDtCtJ2hEC+88/jJHFhSEtovTUrQcqfhffZuB+gJCO2r68s7fQRei+Un1S61RmZLsfq2LTjLBKj7yckklCcrEKqso6mza5Maj65ZYmZnx9w5Z0v0WEE8vN5JaEAlQybTpfjVj041cG2BeKlfGvIgNuul2pUUdsfMky30xLwwoOpZkNZ6KBr4/6Wum1yl3g920HUbK3MaGXgSx6Mht/PWxEU1SSrM9YDhx+bvLZ/lUGHDAl0J0sPfkT5xC7LCGo1NicR0bDwtj258fW4a27HnT1b5NtMCQqYTNIDw0MPydaJrfnbY4qzEfWsnX5tWasKwwFKacZB4IJesYw6icwRKKKEwtYUz6/Z4RzZvHlh2azfKhTm+Y4cB0zsUYJXzsZRvnAQUgdgw9qLL7NvwJEMIyrcmUUwmFiZ8MV3urq6kaaCAoZoTr07OgR4J2gFisd86szZhkoX+cQJBur84dsx18rPS+4KnnysVPaWqutlQsyrEaehq2niFGbPX4FOPePAuz1Zon5U4eOOXZ9eKSbRMAtLnYjFFJ0CxsfqNlfupE5eFuKnK4cMq7BD7xEaM8dfjtlrPwr9QBTbFO7KUWYlyf1qMcqVJQUH6T6KLmft1/tObBWbeB7qHg5kq7d+CO3pXIxNUStUswhUQcbLepzfERrkJRrhAszuUitBI+vA4/AgGZOcjKCZ67ry9VgqulqO4YIbMTVw/Km6shtsGtcGpnWDUX/GH0DRxhf/xW6cD/af9PEyiMEP338g5C0gH7jl3w53aDTagoDmRF79BTHdPw8R3CIVfHD7mAEf2nDrh+SRjHUlVkaTCfL7CTEBtdaDKydTpDrclE4xtmuwcGkSxatqGv67WHlJZnLub1RPmMK2P1VUKP+ctmfBiOQuHNN79BDcHuMReyQg5EKL3dkZ8Wp+Hp5wIqgM3LunojK3VAS9OlCu1Z+RQtocOSZ0kKTZwDfQjmrsamCA6nmSfICS+nqrTWQm8hLkeoQkZt3qppKNWZk1JrMO43nM1Erqv+uHkcS1sL67YcNJPreGnNhbnnfyE9r5wiWJmJU77GZ4hLt0wv68ulCLKrb0HetoJbMy3V2mnBTlT5Y2Cf6/rKc6unDBXUivd2NaKPvwZCdAs9LCN6Xtia+aY03GuH/uYKmpTuoa7pFFHSiMug/NtZfGyvgb+e5rr7c8fPq3DDqoRmAnsG+HWRL88zJm1B4BI7dERTO2F4LaYfYsRC1cr2ZOvsTC9cWM+BgQGr0ZRGNKWkai+Wlgqft2JX2EwccR6uxUQ8DaUwx+4at48yIGfTb7OglsF+Kt7wFmxltNGFx8rFpGQBOhTguhDObhcndtZjNB5M2CeZ0kd3TjHubMT6fG3Mka/XgORcoqnhyWHIKr0jYWraCIOPTigHaeKQTquThpFohr7aScFcUxekLULEy0WqnBrgn3KSCJwJGmdTvL2bZVkP0gAPvUD1n07gk13Rb8OVu5BVrfPaJlt+vDDr+384qiTbp0OBnuA2++JHmsE4fDu1GofCG+aHz5ydgTWq3XPoPzKzXLaSvd4OMWjMypJqB227G2/DDPDXrdeEIdubJczy0doDOQ33PpoTb0CQ02MR0Wi0Q8hNHfnXNSyGxeFGpEs7EN50XQwt315jjHpFSft/1tJfknS7ZgTmJK0EE+WOpXh40puj7uJ0aFu4iK0n3wa8QWt0HGngo715izBHKpnIloBXfXcK+20VIhVUWUdyhuJEj6AxtCKIjyzZb2Upohf2A4JfoSRwG38NBP+kJs0T+jPEcgjODJBZFqo3k2NHeUVhNCSypnZljHcN/s5n1UkYkpLeefzVAXN6lbTzhjhOJKuMRaaV+U2Yf3AECanMFeb5zlXgzBCioIXV4UhLP9J4gjjfaUCIVFldiQ7YwF1lSNKaXZnm/D2lEbNGD686Kgfvz7rliAnCGAsM0AIl4hojkZoxVs3owN/xhrEUZ9pL6fnR3LI7MJMFmt3Iz+XyB8x4HpDZbYUa0vrVKfzXyRCqjDu12A7jtPDmpXa7+7o0e0tluKpRbkVuU1jxe0O0867Yk/TEZYuPXUm7Es6AEa1nP/DYTmZBOUEsd7gCeMm0wIEjwJxY579JyjRcMcVO+fdAizRORGfrsnvo1+Cq0iykE1bbxBrAhFpzhfkr4XxsRVkEwLuayv81f6meHlALExoqQ35fF7XBC7aOEZzx+W131jjRrt6KTGU8tImsrVafIcNNWdMq2CiO+mxJB0wrBaJ0VPdkOsiL+IUXrNcsP7uj1fnKKzYsprk7c3rhU33vPdVKQNg51ijbV8q2m6bq2UXUE7AGbaknSMcdYCkRbRMWkhS/+uSFOSTNG+iFdA90mDHpbYmkzPDeATSyJRN+E/CgC8QpCUps+aDXYIhtd49/X65gfYOU2ew4lxkYyvgZugicTqVli3pHmNKURG9OALK1vZaSUOPM+R5wXpYlsovca8DrBGkisAasHLkJijuLkITwKtRv4mNrDhWUje/LpksLW7qCWFf9xrezveqegS5cGkHixtx8U9BJHi+TTtlHFKnSzyH+oJ7SFtGl14ozEylI+X3iHT1QA6k/mC09tfXvk7QlT5pcsXVOEmzgS9EMBNPgMiCz0XvcA4oFeQpQ7umb4lowdIvydtrfSdQWXtR1DwyfgtmqdKbB6ln7qIyA0LVW0PPPP+x/0nYbwN+TsYKqx3RnW9Vb7gBRm8JGlgtB4QsoJeA8+UhWmPct/OBkKAIC6XFDfmnVbTL7nzii3m7DeV+68H0MrthIEXJdadF70GoSU3AT2eVU18TAirqg27YWcINSkTptLt3eBa3TJXxJT2um+jcXQ3jx9TWSYamixBp0I0FDOHbNMF5YGsLO+JRjN66x7fQWyS6xEXIG31Ae9gNtTP5fMv4QmCwlZ6NduYU/0ikeU+vw1L/3z1zv9MHe6PUgivCpoJJMBwC3U6smy4clrK8Z3GatXBRt58V7V8MB5rgGsV6e5gDNyz5RIcITI+gMKX92YPzxdz5te9CEZFemdq4fCi5/iqvw+wFwXX+Xz0vrKhktAC3VNbrgGIFFedYXxqoTG0c4iLs1+pVVCsabRUmUzpp+OHuoSrGvK2KdqYf1z6Sutq5Nrd1ptwZq0CJei/tc48tLVPuCB/ZHjLyICl68MHjYHe/Z+e/eoiHJa6OJTOouMJvrJj/mziM7PRH2J46u1cgEzoQZpQLJx3jRB0iLChlL7iWJAVgVkohU4xbGv54if5Q1nTguySSVxzwLeLRSdqlejDGzlNa9jiiiY4FjiIX0aHp0vSUu+8B6paGAR2U/xKk=",
               Base64Decoder.decode(src));
       System.out.println(src1);
 

bonus-modules/bonus-smart-canteen/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bonus-smart-canteen</artifactId>
+    <artifactId>bonus-smart-canteen-v2</artifactId>
 
     <description>
         bonus-modules-smart-canteen智慧食堂
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.1</version>
+            <version>3.5.7</version>
         </dependency>
         <!--加密依赖包-->
         <dependency>
@@ -192,7 +192,21 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.arcsoft.face</groupId>
+            <artifactId>arcsoft-sdk-face</artifactId>
+            <version>3.0.0.0-linux</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/arcsoft-sdk-face-3.0.0.0-linux.jar</systemPath>
+        </dependency>
 
+        <dependency>
+            <groupId>arcsoft</groupId>
+            <artifactId>arcsoft</artifactId>
+            <version>3.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/arcsoft-sdk-face-3.0.0.0-windows.jar</systemPath>
+        </dependency>
     </dependencies>
 
     <build>
@@ -201,6 +215,9 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
                 <version>2.4.2</version>
                 <executions>
                     <execution>

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/api/AccTradeApi.java

@@ -5,12 +5,15 @@ import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.bonus.canteen.core.account.v3.api.dto.AccExceptionRecordApiDTO;
 import com.bonus.canteen.core.account.v3.api.dto.AccRechargeSumApiDTO;
+import com.bonus.canteen.core.account.v3.api.vo.AccExceptionRecordApiVO;
 import com.bonus.canteen.core.account.v3.api.vo.AccRechargeSumApiVO;
 import com.bonus.canteen.core.account.v3.api.vo.AccTradeOrderBalanceVO;
 import com.bonus.canteen.core.account.v3.api.vo.AccTradeOrderWalletPayVO;
 import com.bonus.canteen.core.account.v3.model.AccTrade;
 import com.bonus.canteen.core.account.v3.model.AccTradeWalletDetail;
+import com.bonus.canteen.core.account.v3.service.AccExceptionRecordService;
 import com.bonus.canteen.core.account.v3.service.AccTradeService;
 import com.bonus.canteen.core.account.v3.service.AccTradeWalletDetailService;
 import org.slf4j.Logger;
@@ -32,7 +35,9 @@ public class AccTradeApi {
    @Autowired
    @Lazy
    private AccTradeWalletDetailService accTradeWalletDetailService;
-
+   @Autowired
+   @Lazy
+   private AccExceptionRecordService accExceptionRecordService;
 
    public AccRechargeSumApiVO getAccRechargeSum(AccRechargeSumApiDTO accRechargeSumApiDTO) {
       return this.accTradeService.getAccRechargeSum(accRechargeSumApiDTO);
@@ -62,4 +67,8 @@ public class AccTradeApi {
       }
    }
 
+   public List<AccExceptionRecordApiVO> listAccExceptionRecord(AccExceptionRecordApiDTO accExceptionRecordApiDTO) {
+      return this.accExceptionRecordService.listAccExceptionRecord(accExceptionRecordApiDTO.getOrdTradeIdList());
+   }
+
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/api/dto/AccExceptionRecordApiDTO.java

@@ -0,0 +1,16 @@
+package com.bonus.canteen.core.account.v3.api.dto;
+
+import java.util.List;
+
+public class AccExceptionRecordApiDTO {
+   private List<Long> ordTradeIdList;
+
+   public List<Long> getOrdTradeIdList() {
+      return this.ordTradeIdList;
+   }
+
+   public void setOrdTradeIdList(final List<Long> ordTradeIdList) {
+      this.ordTradeIdList = ordTradeIdList;
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/api/dto/AccSubRechargeApiDTO.java

@@ -0,0 +1,136 @@
+package com.bonus.canteen.core.account.v3.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+public class AccSubRechargeApiDTO {
+   @ApiModelProperty("人员id")
+   private @NotNull(
+   message = "{acc_single_null_custid_exception}"
+) Long custId;
+   @ApiModelProperty("充值金额/分")
+   private @Max(
+   value = 10000000L,
+   message = "acc_operation_amount_max_exception"
+) @Min(
+   value = 1L,
+   message = "acc_operation_amount_min_exception"
+) BigDecimal rechargeAmount;
+   @ApiModelProperty("第三方充值订单号")
+   private @NotBlank(
+   message = "{acc_recharge_param_thirdnum_exception}"
+) String thirdRechargeNum;
+   private Integer rechargeSource;
+   @ApiModelProperty("充值备注")
+   private String remark;
+
+   public static AccSubRechargeApiDTOBuilder builder() {
+      return new AccSubRechargeApiDTOBuilder();
+   }
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public BigDecimal getRechargeAmount() {
+      return this.rechargeAmount;
+   }
+
+   public String getThirdRechargeNum() {
+      return this.thirdRechargeNum;
+   }
+
+   public Integer getRechargeSource() {
+      return this.rechargeSource;
+   }
+
+   public String getRemark() {
+      return this.remark;
+   }
+
+   public void setCustId(final Long custId) {
+      this.custId = custId;
+   }
+
+   public void setRechargeAmount(final BigDecimal rechargeAmount) {
+      this.rechargeAmount = rechargeAmount;
+   }
+
+   public void setThirdRechargeNum(final String thirdRechargeNum) {
+      this.thirdRechargeNum = thirdRechargeNum;
+   }
+
+   public void setRechargeSource(final Integer rechargeSource) {
+      this.rechargeSource = rechargeSource;
+   }
+
+   public void setRemark(final String remark) {
+      this.remark = remark;
+   }
+
+   public String toString() {
+      Long var10000 = this.getCustId();
+      return "AccSubRechargeApiDTO(custId=" + var10000 + ", rechargeAmount=" + String.valueOf(this.getRechargeAmount()) + ", thirdRechargeNum=" + this.getThirdRechargeNum() + ", rechargeSource=" + this.getRechargeSource() + ", remark=" + this.getRemark() + ")";
+   }
+
+   public AccSubRechargeApiDTO(final Long custId, final BigDecimal rechargeAmount, final String thirdRechargeNum, final Integer rechargeSource, final String remark) {
+      this.custId = custId;
+      this.rechargeAmount = rechargeAmount;
+      this.thirdRechargeNum = thirdRechargeNum;
+      this.rechargeSource = rechargeSource;
+      this.remark = remark;
+   }
+
+   public AccSubRechargeApiDTO() {
+   }
+
+   public static class AccSubRechargeApiDTOBuilder {
+      private Long custId;
+      private BigDecimal rechargeAmount;
+      private String thirdRechargeNum;
+      private Integer rechargeSource;
+      private String remark;
+
+      AccSubRechargeApiDTOBuilder() {
+      }
+
+      public AccSubRechargeApiDTOBuilder custId(final Long custId) {
+         this.custId = custId;
+         return this;
+      }
+
+      public AccSubRechargeApiDTOBuilder rechargeAmount(final BigDecimal rechargeAmount) {
+         this.rechargeAmount = rechargeAmount;
+         return this;
+      }
+
+      public AccSubRechargeApiDTOBuilder thirdRechargeNum(final String thirdRechargeNum) {
+         this.thirdRechargeNum = thirdRechargeNum;
+         return this;
+      }
+
+      public AccSubRechargeApiDTOBuilder rechargeSource(final Integer rechargeSource) {
+         this.rechargeSource = rechargeSource;
+         return this;
+      }
+
+      public AccSubRechargeApiDTOBuilder remark(final String remark) {
+         this.remark = remark;
+         return this;
+      }
+
+      public AccSubRechargeApiDTO build() {
+         return new AccSubRechargeApiDTO(this.custId, this.rechargeAmount, this.thirdRechargeNum, this.rechargeSource, this.remark);
+      }
+
+      public String toString() {
+         Long var10000 = this.custId;
+         return "AccSubRechargeApiDTO.AccSubRechargeApiDTOBuilder(custId=" + var10000 + ", rechargeAmount=" + String.valueOf(this.rechargeAmount) + ", thirdRechargeNum=" + this.thirdRechargeNum + ", rechargeSource=" + this.rechargeSource + ", remark=" + this.remark + ")";
+      }
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/api/vo/AccExceptionRecordApiVO.java

@@ -0,0 +1,42 @@
+package com.bonus.canteen.core.account.v3.api.vo;
+
+
+import com.bonus.canteen.core.account.v3.model.AccExceptionRecord;
+
+public class AccExceptionRecordApiVO {
+   private Long id;
+   private Long ordTradeId;
+   private Integer recordStatus;
+
+   public static AccExceptionRecordApiVO of(AccExceptionRecord accExceptionRecord) {
+      return (new AccExceptionRecordApiVO()).setId(accExceptionRecord.getId()).setOrdTradeId(accExceptionRecord.getRelationId()).setRecordStatus(accExceptionRecord.getRecordStatus());
+   }
+
+   public Long getId() {
+      return this.id;
+   }
+
+   public Long getOrdTradeId() {
+      return this.ordTradeId;
+   }
+
+   public Integer getRecordStatus() {
+      return this.recordStatus;
+   }
+
+   public AccExceptionRecordApiVO setId(final Long id) {
+      this.id = id;
+      return this;
+   }
+
+   public AccExceptionRecordApiVO setOrdTradeId(final Long ordTradeId) {
+      this.ordTradeId = ordTradeId;
+      return this;
+   }
+
+   public AccExceptionRecordApiVO setRecordStatus(final Integer recordStatus) {
+      this.recordStatus = recordStatus;
+      return this;
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/api/vo/AccInfoDetailVO.java

@@ -5,7 +5,6 @@ import com.bonus.canteen.core.account.v3.constants.AccStatusEnum;
 import com.bonus.canteen.core.common.encrypt.LeNiuDecryptDataProcess;
 import com.bonus.canteen.core.common.encrypt.LeNiuDecryptField;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.math.BigDecimal;
 
@@ -211,7 +210,36 @@ public class AccInfoDetailVO {
       this.productCost = productCost;
    }
 
-   @Data
+   public String toString() {
+      Long var10000 = this.getCustId();
+      return "AccInfoDetailVO(custId=" + var10000 + ", custName=" + this.getCustName() + ", accId=" + this.getAccId() + ", custThirdId=" + this.getCustThirdId() + ", orgId=" + this.getOrgId() + ", psnType=" + this.getPsnType() + ", accStatus=" + this.getAccStatus() + ", accBalTotal=" + String.valueOf(this.getAccBalTotal()) + ", accAllBal=" + String.valueOf(this.getAccAllBal()) + ", walletBal=" + String.valueOf(this.getWalletBal()) + ", subsidyBal=" + String.valueOf(this.getSubsidyBal()) + ", redEnvelope=" + String.valueOf(this.getRedEnvelope()) + ", walletFreezeBal=" + String.valueOf(this.getWalletFreezeBal()) + ", subFreezeBal=" + String.valueOf(this.getSubFreezeBal()) + ", accFreezeBalTotal=" + String.valueOf(this.getAccFreezeBalTotal()) + ", serialNum=" + this.getSerialNum() + ", cardStatus=" + this.getCardStatus() + ", deposit=" + this.getDeposit() + ", productCost=" + this.getProductCost() + ")";
+   }
+
+   public AccInfoDetailVO(final Long custId, final String custName, final Long accId, final String custThirdId, final Long orgId, final Integer psnType, final Integer accStatus, final BigDecimal accBalTotal, final BigDecimal accAllBal, final BigDecimal walletBal, final BigDecimal subsidyBal, final BigDecimal redEnvelope, final BigDecimal walletFreezeBal, final BigDecimal subFreezeBal, final BigDecimal accFreezeBalTotal, final String serialNum, final Integer cardStatus, final Integer deposit, final Integer productCost) {
+      this.custId = custId;
+      this.custName = custName;
+      this.accId = accId;
+      this.custThirdId = custThirdId;
+      this.orgId = orgId;
+      this.psnType = psnType;
+      this.accStatus = accStatus;
+      this.accBalTotal = accBalTotal;
+      this.accAllBal = accAllBal;
+      this.walletBal = walletBal;
+      this.subsidyBal = subsidyBal;
+      this.redEnvelope = redEnvelope;
+      this.walletFreezeBal = walletFreezeBal;
+      this.subFreezeBal = subFreezeBal;
+      this.accFreezeBalTotal = accFreezeBalTotal;
+      this.serialNum = serialNum;
+      this.cardStatus = cardStatus;
+      this.deposit = deposit;
+      this.productCost = productCost;
+   }
+
+   public AccInfoDetailVO() {
+   }
+
    public static class AccInfoDetailVOBuilder {
       private Long custId;
       private String custName;
@@ -232,5 +260,112 @@ public class AccInfoDetailVO {
       private Integer cardStatus;
       private Integer deposit;
       private Integer productCost;
+
+      AccInfoDetailVOBuilder() {
+      }
+
+      public AccInfoDetailVOBuilder custId(final Long custId) {
+         this.custId = custId;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder custName(final String custName) {
+         this.custName = custName;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder accId(final Long accId) {
+         this.accId = accId;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder custThirdId(final String custThirdId) {
+         this.custThirdId = custThirdId;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder orgId(final Long orgId) {
+         this.orgId = orgId;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder psnType(final Integer psnType) {
+         this.psnType = psnType;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder accStatus(final Integer accStatus) {
+         this.accStatus = accStatus;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder accBalTotal(final BigDecimal accBalTotal) {
+         this.accBalTotal = accBalTotal;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder accAllBal(final BigDecimal accAllBal) {
+         this.accAllBal = accAllBal;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder walletBal(final BigDecimal walletBal) {
+         this.walletBal = walletBal;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder subsidyBal(final BigDecimal subsidyBal) {
+         this.subsidyBal = subsidyBal;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder redEnvelope(final BigDecimal redEnvelope) {
+         this.redEnvelope = redEnvelope;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder walletFreezeBal(final BigDecimal walletFreezeBal) {
+         this.walletFreezeBal = walletFreezeBal;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder subFreezeBal(final BigDecimal subFreezeBal) {
+         this.subFreezeBal = subFreezeBal;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder accFreezeBalTotal(final BigDecimal accFreezeBalTotal) {
+         this.accFreezeBalTotal = accFreezeBalTotal;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder serialNum(final String serialNum) {
+         this.serialNum = serialNum;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder cardStatus(final Integer cardStatus) {
+         this.cardStatus = cardStatus;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder deposit(final Integer deposit) {
+         this.deposit = deposit;
+         return this;
+      }
+
+      public AccInfoDetailVOBuilder productCost(final Integer productCost) {
+         this.productCost = productCost;
+         return this;
+      }
+
+      public AccInfoDetailVO build() {
+         return new AccInfoDetailVO(this.custId, this.custName, this.accId, this.custThirdId, this.orgId, this.psnType, this.accStatus, this.accBalTotal, this.accAllBal, this.walletBal, this.subsidyBal, this.redEnvelope, this.walletFreezeBal, this.subFreezeBal, this.accFreezeBalTotal, this.serialNum, this.cardStatus, this.deposit, this.productCost);
+      }
+
+      public String toString() {
+         Long var10000 = this.custId;
+         return "AccInfoDetailVO.AccInfoDetailVOBuilder(custId=" + var10000 + ", custName=" + this.custName + ", accId=" + this.accId + ", custThirdId=" + this.custThirdId + ", orgId=" + this.orgId + ", psnType=" + this.psnType + ", accStatus=" + this.accStatus + ", accBalTotal=" + String.valueOf(this.accBalTotal) + ", accAllBal=" + String.valueOf(this.accAllBal) + ", walletBal=" + String.valueOf(this.walletBal) + ", subsidyBal=" + String.valueOf(this.subsidyBal) + ", redEnvelope=" + String.valueOf(this.redEnvelope) + ", walletFreezeBal=" + String.valueOf(this.walletFreezeBal) + ", subFreezeBal=" + String.valueOf(this.subFreezeBal) + ", accFreezeBalTotal=" + String.valueOf(this.accFreezeBalTotal) + ", serialNum=" + this.serialNum + ", cardStatus=" + this.cardStatus + ", deposit=" + this.deposit + ", productCost=" + this.productCost + ")";
+      }
    }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/api/vo/AccInfoServiceV3Api.java

@@ -2,10 +2,24 @@ package com.bonus.canteen.core.account.v3.api.vo;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
+import com.bonus.canteen.core.account.v3.api.dto.AccStatisticsSumDTO;
+import com.bonus.canteen.core.account.v3.extension.ThirdAccountExtensionService;
+import com.bonus.canteen.core.account.v3.extension.dto.ThirdAccountSupportDTO;
+import com.bonus.canteen.core.account.v3.extension.dto.ThirdBalanceDTO;
+import com.bonus.canteen.core.account.v3.extension.vo.ThirdBalanceVO;
+import com.bonus.canteen.core.account.v3.po.AccInfoAddPO;
 import com.bonus.canteen.core.account.v3.po.AccInfoUpdatePO;
 import com.bonus.canteen.core.account.v3.service.AccInfoService;
-import com.bonus.canteen.core.account.v3.service.AccWalletInfoService;
-import com.bonus.canteen.core.account.v4.api.CardInfoServiceV4Api;
+import com.bonus.canteen.core.account.v3.web.dto.AccInfoDetailDTO;
+import com.bonus.canteen.core.common.redis.RedisUtil;
+import com.bonus.canteen.core.common.utils.TenantContextHolder;
+import com.bonus.canteen.core.customer.constants.CustCacheKey;
+import com.bonus.canteen.core.customer.dto.MachineAccountInfoV3DTO;
+import com.bonus.canteen.core.customer.model.CustAccTemp;
+import com.bonus.canteen.core.customer.service.CustAccTempService;
+import com.bonus.common.core.exception.ServiceException;
+import com.bonus.common.houqin.i18n.I18n;
+import com.bonus.common.houqin.utils.LeBeanUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,10 +29,6 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
 @Service
@@ -29,11 +39,109 @@ public class AccInfoServiceV3Api {
    @Autowired
    @Lazy
    private AccInfoService accInfoService;
+   @Autowired
+   @Lazy
+   CustAccTempService custAccTempService;
+//   @Autowired
+//   @Lazy
+//   private CustomBizApi customBizApi;
+
+   public Long insertAccInfo(@Valid AccInfoAddPO accInfoAddPO) {
+      return this.accInfoService.insertAccInfo(accInfoAddPO);
+   }
 
    public void updateAccInfo(AccInfoUpdatePO updatePO) {
       this.accInfoService.updateAccInfo(updatePO);
    }
 
+   public AccInfoDetailVO getAccInfoDetail(Long custId) {
+      AccInfoDetailVO accInfoDetail = this.accInfoService.getAccInfoDetail(AccInfoDetailDTO.builder().custId(custId).build());
+      if (ObjectUtil.isNull(accInfoDetail)) {
+         throw new ServiceException(I18n.getMessage("acc_not_exits"));
+      } else {
+         return accInfoDetail;
+      }
+   }
 
+   public AccInfoDetailVO getAccInfoDetailAndThird(Long custId) {
+      AccInfoDetailVO accInfoDetail = this.accInfoService.getAccInfoDetail(AccInfoDetailDTO.builder().custId(custId).build());
+      if (ObjectUtil.isNull(accInfoDetail)) {
+         throw new ServiceException(I18n.getMessage("acc_not_exits"));
+      } else {
+//         ThirdBalanceVO thirdBalanceVO = (ThirdBalanceVO) RedisUtil.getObj(CustCacheKey.getThirdAccountTenantKey(custId.toString()));
+//         if (ObjectUtil.isNull(thirdBalanceVO)) {
+//            MachineAccountInfoV3DTO infoV3DTO = new MachineAccountInfoV3DTO();
+//            infoV3DTO.setCustId(custId);
+//            thirdBalanceVO = this.queryThirdAccountInfo(infoV3DTO);
+//         }
+//
+//         if (ObjectUtil.isNotNull(thirdBalanceVO)) {
+//            BigDecimal total = accInfoDetail.getAccBalTotal().add((BigDecimal)Optional.ofNullable(thirdBalanceVO.getThirdAccountBalance()).orElse(BigDecimal.ZERO));
+//            accInfoDetail.setAccBalTotal(total);
+//         } // 暂不查询三方余额 dgw 25-03-17
 
+         log.info("综合第三方后账户信息：{}", JSONUtil.toJsonStr(accInfoDetail));
+         return accInfoDetail;
+      }
+   }
+
+   public AccStatisticsSumVO accStatisticsSum(AccStatisticsSumDTO accStatisticsSumDTO) {
+      return this.accInfoService.accStatisticsSum(accStatisticsSumDTO);
+   }
+
+//   public ThirdBalanceVO queryThirdAccountInfo(MachineAccountInfoV3DTO macQueryParams) {
+//      CustAccTemp custAccTempAccount = this.custAccTempService.checkAndGetAccountInfo(macQueryParams);
+//      ThirdAccountSupportDTO thirdAccountSupportDTO = LeBeanUtil.copyCreateProperties(macQueryParams, ThirdAccountSupportDTO.class);
+//      if (ObjectUtil.isNotNull(custAccTempAccount)) {
+//         thirdAccountSupportDTO.setPsnType(custAccTempAccount.getPsnType());
+//      }
+//
+//      ThirdAccountExtensionService thirdAccountService = this.customBizApi.getThirdAccountService(TenantContextHolder.getTenantId());
+//      if (!ObjectUtil.isNull(thirdAccountService) && thirdAccountService.supportThirdAccount(thirdAccountSupportDTO).support()) {
+//         ThirdBalanceDTO.ThirdBalanceDTOBuilder builder = ThirdBalanceDTO.builder();
+//         AccCard accCard;
+//         if (ObjectUtil.isNotEmpty(macQueryParams.getSerialNum())) {
+//            accCard = this.cardInfoServiceV4Api.oneCardInfoBySerialNum(macQueryParams.getSerialNum());
+//            if (ObjectUtil.isNull(accCard)) {
+//               throw new LeException(I18n.getMessage("acc.third.uncorrelated.exception", new Object[0]));
+//            }
+//
+//            builder.thirdSerialNum(accCard.getThirdSerialNum()).serialNum(macQueryParams.getSerialNum());
+//         } else if (ObjectUtil.isNotEmpty(macQueryParams.getAuthCode())) {
+//            macQueryParams.setCustThirdId("");
+//            builder.thirdAuthCode(macQueryParams.getAuthCode());
+//         } else {
+//            accCard = this.cardInfoServiceV4Api.queryOneCardInfoByCustId(macQueryParams.getCustId());
+//            if (ObjectUtil.isNotNull(accCard)) {
+//               builder.thirdSerialNum(accCard.getThirdSerialNum()).serialNum(accCard.getSerialNum());
+//            }
+//         }
+//
+//         if (ObjectUtil.isNotNull(custAccTempAccount)) {
+//            builder.custThirdId(custAccTempAccount.getCustThirdId()).psnType(custAccTempAccount.getPsnType()).custNum(custAccTempAccount.getCustNum()).custId(custAccTempAccount.getCustId());
+//         }
+//
+//         ThirdBalanceVO thirdBalanceVO = thirdAccountService.getBalance(builder.build());
+//         log.info("三方账户信息:{}", JSONUtil.toJsonStr(thirdBalanceVO));
+//         if (ObjectUtil.isNull(thirdBalanceVO)) {
+//            throw new ServiceException(I18n.getMessage("acc.third.empty.exception"));
+//         } else {
+//            if (ObjectUtil.isNull(custAccTempAccount)) {
+//               if (ObjectUtil.isEmpty(thirdBalanceVO.getCustThirdId())) {
+//                  throw new ServiceException(I18n.getMessage("acc.third.empty.exception"));
+//               }
+//
+//               MachineAccountInfoV3DTO machineAccountInfoV3DTO = new MachineAccountInfoV3DTO();
+//               machineAccountInfoV3DTO.setCustThirdId(thirdBalanceVO.getCustThirdId());
+//               custAccTempAccount = this.custAccTempService.checkAndGetAccountInfo(machineAccountInfoV3DTO);
+//            }
+//
+//            RedisUtil.setObj(CustCacheKey.getThirdAccountTenantKey(custAccTempAccount.getCustId().toString()), thirdBalanceVO, 2400L);
+//            return thirdBalanceVO;
+//         }
+//      } else {
+//         log.info("查三方账户余额...");
+//         return null;
+//      }
+//   }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/api/vo/AccRechargeResultApiVO.java

@@ -0,0 +1,106 @@
+package com.bonus.canteen.core.account.v3.api.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+public class AccRechargeResultApiVO {
+   @ApiModelProperty("交易记录id")
+   private Long rechargeId;
+   @ApiModelProperty("小牛用户id")
+   private Long custId;
+   @ApiModelProperty("第三方人员id")
+   private String custThirdId;
+   @ApiModelProperty("账户总余额(个人钱包+补贴钱包+红包)单位分")
+   private BigDecimal accBal;
+
+   public static AccRechargeResultApiVOBuilder builder() {
+      return new AccRechargeResultApiVOBuilder();
+   }
+
+   public Long getRechargeId() {
+      return this.rechargeId;
+   }
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public String getCustThirdId() {
+      return this.custThirdId;
+   }
+
+   public BigDecimal getAccBal() {
+      return this.accBal;
+   }
+
+   public void setRechargeId(final Long rechargeId) {
+      this.rechargeId = rechargeId;
+   }
+
+   public void setCustId(final Long custId) {
+      this.custId = custId;
+   }
+
+   public void setCustThirdId(final String custThirdId) {
+      this.custThirdId = custThirdId;
+   }
+
+   public void setAccBal(final BigDecimal accBal) {
+      this.accBal = accBal;
+   }
+
+   public String toString() {
+      Long var10000 = this.getRechargeId();
+      return "AccRechargeResultApiVO(rechargeId=" + var10000 + ", custId=" + this.getCustId() + ", custThirdId=" + this.getCustThirdId() + ", accBal=" + String.valueOf(this.getAccBal()) + ")";
+   }
+
+   public AccRechargeResultApiVO(final Long rechargeId, final Long custId, final String custThirdId, final BigDecimal accBal) {
+      this.rechargeId = rechargeId;
+      this.custId = custId;
+      this.custThirdId = custThirdId;
+      this.accBal = accBal;
+   }
+
+   public AccRechargeResultApiVO() {
+   }
+
+   public static class AccRechargeResultApiVOBuilder {
+      private Long rechargeId;
+      private Long custId;
+      private String custThirdId;
+      private BigDecimal accBal;
+
+      AccRechargeResultApiVOBuilder() {
+      }
+
+      public AccRechargeResultApiVOBuilder rechargeId(final Long rechargeId) {
+         this.rechargeId = rechargeId;
+         return this;
+      }
+
+      public AccRechargeResultApiVOBuilder custId(final Long custId) {
+         this.custId = custId;
+         return this;
+      }
+
+      public AccRechargeResultApiVOBuilder custThirdId(final String custThirdId) {
+         this.custThirdId = custThirdId;
+         return this;
+      }
+
+      public AccRechargeResultApiVOBuilder accBal(final BigDecimal accBal) {
+         this.accBal = accBal;
+         return this;
+      }
+
+      public AccRechargeResultApiVO build() {
+         return new AccRechargeResultApiVO(this.rechargeId, this.custId, this.custThirdId, this.accBal);
+      }
+
+      public String toString() {
+         Long var10000 = this.rechargeId;
+         return "AccRechargeResultApiVO.AccRechargeResultApiVOBuilder(rechargeId=" + var10000 + ", custId=" + this.custId + ", custThirdId=" + this.custThirdId + ", accBal=" + String.valueOf(this.accBal) + ")";
+      }
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/api/vo/AccStatisticsSumVO.java

@@ -0,0 +1,29 @@
+package com.bonus.canteen.core.account.v3.api.vo;
+
+public class AccStatisticsSumVO {
+   private AccCountStatisticsVO accCountStatisticsVO;
+   private AccCardStatisticsVO accCardStatisticsVO;
+
+   public AccCountStatisticsVO getAccCountStatisticsVO() {
+      return this.accCountStatisticsVO;
+   }
+
+   public AccCardStatisticsVO getAccCardStatisticsVO() {
+      return this.accCardStatisticsVO;
+   }
+
+   public AccStatisticsSumVO setAccCountStatisticsVO(final AccCountStatisticsVO accCountStatisticsVO) {
+      this.accCountStatisticsVO = accCountStatisticsVO;
+      return this;
+   }
+
+   public AccStatisticsSumVO setAccCardStatisticsVO(final AccCardStatisticsVO accCardStatisticsVO) {
+      this.accCardStatisticsVO = accCardStatisticsVO;
+      return this;
+   }
+
+   public String toString() {
+      String var10000 = String.valueOf(this.getAccCountStatisticsVO());
+      return "AccStatisticsSumVO(accCountStatisticsVO=" + var10000 + ", accCardStatisticsVO=" + String.valueOf(this.getAccCardStatisticsVO()) + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/app/dto/AccReceiveSubRuleDTO.java

@@ -0,0 +1,51 @@
+package com.bonus.canteen.core.account.v3.app.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+
+@ApiModel("提前领取补贴规则实体")
+public class AccReceiveSubRuleDTO {
+   @ApiModelProperty("用户id")
+   private @NotNull(
+   message = "{acc_single_null_custid_exception}"
+) Long custId;
+   @ApiModelProperty("补贴规则id")
+   private @NotNull(
+   message = "{acc_sub_time_null_ruleid_exception}"
+) Long timeId;
+   @ApiModelProperty("1-补贴规则领取 2-手动发放领取")
+   private @NotNull(
+   message = "{acc_update_param_exception}"
+) Integer receiveType;
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public Long getTimeId() {
+      return this.timeId;
+   }
+
+   public Integer getReceiveType() {
+      return this.receiveType;
+   }
+
+   public void setCustId(final Long custId) {
+      this.custId = custId;
+   }
+
+   public void setTimeId(final Long timeId) {
+      this.timeId = timeId;
+   }
+
+   public void setReceiveType(final Integer receiveType) {
+      this.receiveType = receiveType;
+   }
+
+   public String toString() {
+      Long var10000 = this.getCustId();
+      return "AccReceiveSubRuleDTO(custId=" + var10000 + ", timeId=" + this.getTimeId() + ", receiveType=" + this.getReceiveType() + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/app/dto/AccRuleSendSubDTO.java

@@ -0,0 +1,67 @@
+package com.bonus.canteen.core.account.v3.app.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+public class AccRuleSendSubDTO {
+   @ApiModelProperty("用户id")
+   private Long custId;
+   @ApiModelProperty("补贴发放前是否清零,1.是 2否")
+   private Integer clearSub;
+   @ApiModelProperty("补贴金额")
+   private BigDecimal amount;
+   @ApiModelProperty("补贴定时规则id")
+   private Long timeId;
+   private Integer validateDay;
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public Integer getClearSub() {
+      return this.clearSub;
+   }
+
+   public BigDecimal getAmount() {
+      return this.amount;
+   }
+
+   public Long getTimeId() {
+      return this.timeId;
+   }
+
+   public Integer getValidateDay() {
+      return this.validateDay;
+   }
+
+   public AccRuleSendSubDTO setCustId(final Long custId) {
+      this.custId = custId;
+      return this;
+   }
+
+   public AccRuleSendSubDTO setClearSub(final Integer clearSub) {
+      this.clearSub = clearSub;
+      return this;
+   }
+
+   public AccRuleSendSubDTO setAmount(final BigDecimal amount) {
+      this.amount = amount;
+      return this;
+   }
+
+   public AccRuleSendSubDTO setTimeId(final Long timeId) {
+      this.timeId = timeId;
+      return this;
+   }
+
+   public AccRuleSendSubDTO setValidateDay(final Integer validateDay) {
+      this.validateDay = validateDay;
+      return this;
+   }
+
+   public String toString() {
+      Long var10000 = this.getCustId();
+      return "AccRuleSendSubDTO(custId=" + var10000 + ", clearSub=" + this.getClearSub() + ", amount=" + String.valueOf(this.getAmount()) + ", timeId=" + this.getTimeId() + ", validateDay=" + this.getValidateDay() + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/app/dto/AppApplyDrawDTO.java

@@ -0,0 +1,78 @@
+package com.bonus.canteen.core.account.v3.app.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+public class AppApplyDrawDTO {
+   @ApiModelProperty("人员id")
+   private @NotNull(
+   message = "{acc_single_null_custid_exception}"
+) Long custId;
+   @ApiModelProperty("申请金额")
+   private @NotNull(
+   message = "{acc_operation_amount_null_exception}"
+) @DecimalMin(
+   value = "1",
+   message = "{acc_operation_amount_min_exception}"
+) BigDecimal applyAmount;
+   @ApiModelProperty("申请原因")
+   private String applyReason;
+   @ApiModelProperty(
+      value = "审批状态(1-待审批 2-同意 3-拒绝)",
+      hidden = true
+   )
+   private Integer auditStatus;
+   @ApiModelProperty(
+      value = "是否审批放行",
+      hidden = true
+   )
+   private Boolean ifApproveRelease;
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public BigDecimal getApplyAmount() {
+      return this.applyAmount;
+   }
+
+   public String getApplyReason() {
+      return this.applyReason;
+   }
+
+   public Integer getAuditStatus() {
+      return this.auditStatus;
+   }
+
+   public Boolean getIfApproveRelease() {
+      return this.ifApproveRelease;
+   }
+
+   public void setCustId(final Long custId) {
+      this.custId = custId;
+   }
+
+   public void setApplyAmount(final BigDecimal applyAmount) {
+      this.applyAmount = applyAmount;
+   }
+
+   public void setApplyReason(final String applyReason) {
+      this.applyReason = applyReason;
+   }
+
+   public void setAuditStatus(final Integer auditStatus) {
+      this.auditStatus = auditStatus;
+   }
+
+   public void setIfApproveRelease(final Boolean ifApproveRelease) {
+      this.ifApproveRelease = ifApproveRelease;
+   }
+
+   public String toString() {
+      Long var10000 = this.getCustId();
+      return "AppApplyDrawDTO(custId=" + var10000 + ", applyAmount=" + String.valueOf(this.getApplyAmount()) + ", applyReason=" + this.getApplyReason() + ", auditStatus=" + this.getAuditStatus() + ", ifApproveRelease=" + this.getIfApproveRelease() + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/app/dto/AppDrawAuditPageDTO.java

@@ -0,0 +1,38 @@
+package com.bonus.canteen.core.account.v3.app.dto;
+
+import com.bonus.canteen.core.common.page.PageDTO;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+public class AppDrawAuditPageDTO extends PageDTO {
+   @ApiModelProperty("人员id")
+   private @NotNull(
+   message = "{acc_single_null_custid_exception}"
+) Long custId;
+   @ApiModelProperty("审批状态(1-待审批 2-同意 3-拒绝)")
+   private List<Integer> auditStatusList;
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public List<Integer> getAuditStatusList() {
+      return this.auditStatusList;
+   }
+
+   public void setCustId(final Long custId) {
+      this.custId = custId;
+   }
+
+   public void setAuditStatusList(final List<Integer> auditStatusList) {
+      this.auditStatusList = auditStatusList;
+   }
+
+   public String toString() {
+      Long var10000 = this.getCustId();
+      return "AppDrawAuditPageDTO(custId=" + var10000 + ", auditStatusList=" + String.valueOf(this.getAuditStatusList()) + ")";
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/app/dto/AppWorkWithdrawPageDTO.java

@@ -0,0 +1,58 @@
+package com.bonus.canteen.core.account.v3.app.dto;
+
+import com.bonus.canteen.core.common.page.PageDTO;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotEmpty;
+import java.time.LocalDateTime;
+import java.util.List;
+
+public class AppWorkWithdrawPageDTO extends PageDTO {
+   @ApiModelProperty("开始时间")
+   private LocalDateTime startDateTime;
+   @ApiModelProperty("结束时间")
+   private LocalDateTime endDateTime;
+   @ApiModelProperty("关键字查询,人员编号,姓名,手机号")
+   private String keyword;
+   @ApiModelProperty("审批状态 1待审批 2已同意 3已拒绝")
+   private @NotEmpty(
+   message = "审批状态入参不能为空"
+) List<Integer> approvalStatus;
+
+   public LocalDateTime getStartDateTime() {
+      return this.startDateTime;
+   }
+
+   public LocalDateTime getEndDateTime() {
+      return this.endDateTime;
+   }
+
+   public String getKeyword() {
+      return this.keyword;
+   }
+
+   public List<Integer> getApprovalStatus() {
+      return this.approvalStatus;
+   }
+
+   public void setStartDateTime(final LocalDateTime startDateTime) {
+      this.startDateTime = startDateTime;
+   }
+
+   public void setEndDateTime(final LocalDateTime endDateTime) {
+      this.endDateTime = endDateTime;
+   }
+
+   public void setKeyword(final String keyword) {
+      this.keyword = keyword;
+   }
+
+   public void setApprovalStatus(final List<Integer> approvalStatus) {
+      this.approvalStatus = approvalStatus;
+   }
+
+   public String toString() {
+      String var10000 = String.valueOf(this.getStartDateTime());
+      return "AppWorkWithdrawPageDTO(startDateTime=" + var10000 + ", endDateTime=" + String.valueOf(this.getEndDateTime()) + ", keyword=" + this.getKeyword() + ", approvalStatus=" + String.valueOf(this.getApprovalStatus()) + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/app/vo/AppDrawAuditPageVO.java

@@ -0,0 +1,160 @@
+package com.bonus.canteen.core.account.v3.app.vo;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.bonus.canteen.core.account.v3.constants.AccDrawAuditEnum;
+import com.bonus.canteen.core.account.v3.constants.AccDrawAuditResultEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+
+public class AppDrawAuditPageVO {
+   @ApiModelProperty("申请记录Id")
+   private Long auditId;
+   @ApiModelProperty("申请取款金额/分")
+   private Integer applyAmount;
+   @ApiModelProperty("审批状态(1-待审批 2-同意 3-拒绝)")
+   private Integer auditStatus;
+   @ApiModelProperty("审批状态说明")
+   private String auditStatusName;
+   @ApiModelProperty("申请时间")
+   private LocalDateTime crtime;
+   @ApiModelProperty("申请原因")
+   private String applyReason;
+   @ApiModelProperty("审批时间")
+   private LocalDateTime uptime;
+   @ApiModelProperty("实际取款金额内容描述")
+   private String actualAmountContent;
+   @ApiModelProperty(
+      value = "实际取款金额/分",
+      hidden = true
+   )
+   private Integer actualAmount;
+   @ApiModelProperty(
+      value = "实际取款金额（现金部分）/分",
+      hidden = true
+   )
+   private Integer cashAmount;
+   private Integer withDrawResult;
+   @ApiModelProperty("提现结果")
+   private String withDrawResultName;
+   @ApiModelProperty("拒绝原因")
+   private String refusedReason;
+
+   public String getAuditStatusName() {
+      return ObjectUtil.isNotNull(this.auditStatus) ? AccDrawAuditEnum.getDesc(this.auditStatus) : this.auditStatusName;
+   }
+
+   public String getActualAmountContent() {
+      if (ObjectUtil.isNotNull(this.actualAmount)) {
+         BigDecimal actualAmountYuan = (new BigDecimal(this.getActualAmount())).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
+         BigDecimal cashAmounttYuan = (new BigDecimal(this.getCashAmount())).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
+         String var10000 = String.valueOf(actualAmountYuan);
+         return var10000 + "元;其中现金部分" + String.valueOf(cashAmounttYuan) + "元";
+      } else {
+         return this.actualAmountContent;
+      }
+   }
+
+   public String getWithDrawResultName() {
+      return ObjectUtil.isNotNull(this.withDrawResult) ? AccDrawAuditResultEnum.getDesc(this.withDrawResult) : this.withDrawResultName;
+   }
+
+   public Long getAuditId() {
+      return this.auditId;
+   }
+
+   public Integer getApplyAmount() {
+      return this.applyAmount;
+   }
+
+   public Integer getAuditStatus() {
+      return this.auditStatus;
+   }
+
+   public LocalDateTime getCrtime() {
+      return this.crtime;
+   }
+
+   public String getApplyReason() {
+      return this.applyReason;
+   }
+
+   public LocalDateTime getUptime() {
+      return this.uptime;
+   }
+
+   public Integer getActualAmount() {
+      return this.actualAmount;
+   }
+
+   public Integer getCashAmount() {
+      return this.cashAmount;
+   }
+
+   public Integer getWithDrawResult() {
+      return this.withDrawResult;
+   }
+
+   public String getRefusedReason() {
+      return this.refusedReason;
+   }
+
+   public void setAuditId(final Long auditId) {
+      this.auditId = auditId;
+   }
+
+   public void setApplyAmount(final Integer applyAmount) {
+      this.applyAmount = applyAmount;
+   }
+
+   public void setAuditStatus(final Integer auditStatus) {
+      this.auditStatus = auditStatus;
+   }
+
+   public void setAuditStatusName(final String auditStatusName) {
+      this.auditStatusName = auditStatusName;
+   }
+
+   public void setCrtime(final LocalDateTime crtime) {
+      this.crtime = crtime;
+   }
+
+   public void setApplyReason(final String applyReason) {
+      this.applyReason = applyReason;
+   }
+
+   public void setUptime(final LocalDateTime uptime) {
+      this.uptime = uptime;
+   }
+
+   public void setActualAmountContent(final String actualAmountContent) {
+      this.actualAmountContent = actualAmountContent;
+   }
+
+   public void setActualAmount(final Integer actualAmount) {
+      this.actualAmount = actualAmount;
+   }
+
+   public void setCashAmount(final Integer cashAmount) {
+      this.cashAmount = cashAmount;
+   }
+
+   public void setWithDrawResult(final Integer withDrawResult) {
+      this.withDrawResult = withDrawResult;
+   }
+
+   public void setWithDrawResultName(final String withDrawResultName) {
+      this.withDrawResultName = withDrawResultName;
+   }
+
+   public void setRefusedReason(final String refusedReason) {
+      this.refusedReason = refusedReason;
+   }
+
+   public String toString() {
+      Long var10000 = this.getAuditId();
+      return "AppDrawAuditPageVO(auditId=" + var10000 + ", applyAmount=" + this.getApplyAmount() + ", auditStatus=" + this.getAuditStatus() + ", auditStatusName=" + this.getAuditStatusName() + ", crtime=" + String.valueOf(this.getCrtime()) + ", applyReason=" + this.getApplyReason() + ", uptime=" + String.valueOf(this.getUptime()) + ", actualAmountContent=" + this.getActualAmountContent() + ", actualAmount=" + this.getActualAmount() + ", cashAmount=" + this.getCashAmount() + ", withDrawResult=" + this.getWithDrawResult() + ", withDrawResultName=" + this.getWithDrawResultName() + ", refusedReason=" + this.getRefusedReason() + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/app/vo/AppPersonSubRuleVO.java

@@ -0,0 +1,112 @@
+package com.bonus.canteen.core.account.v3.app.vo;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.bonus.canteen.core.account.v3.metadata.model.AccSubMetadataModel;
+import com.bonus.canteen.core.account.v3.model.AccSubTime;
+import com.bonus.common.houqin.constant.LeConstants;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+@ApiModel("app可提前领取补贴规则实体")
+public class AppPersonSubRuleVO {
+   @ApiModelProperty("用户id")
+   private Long custId;
+   @ApiModelProperty("领取金额")
+   private BigDecimal amount;
+   @ApiModelProperty("定时任务id")
+   private Long timeId;
+   @ApiModelProperty("定时任务名称")
+   private String timeName;
+   @ApiModelProperty("描述")
+   private String contentDes;
+   @ApiModelProperty("1-补贴规则领取 2-手动发放领取")
+   private Integer receiveType;
+
+   public String getTimeName() {
+      return StrUtil.isNotBlank(this.timeName) ? this.timeName : "补贴";
+   }
+
+   public static AppPersonSubRuleVO assembleForAccSubTime(Long custId, AccSubTime accSubTime, AccSubMetadataModel metadataModel) {
+      AppPersonSubRuleVO po = new AppPersonSubRuleVO();
+      po.setCustId(custId);
+      po.setAmount(accSubTime.getAmount());
+      po.setTimeId(accSubTime.getTimeId());
+      po.setTimeName(accSubTime.getTimeName());
+      po.setReceiveType(LeConstants.COMMON_YES);
+      int timeStart = Integer.parseInt(accSubTime.getTimeStart());
+      LocalDate today = LocalDate.now();
+      String contentDes = "";
+      if (ObjectUtil.isNotNull(metadataModel) && LeConstants.COMMON_YES.equals(Integer.valueOf(metadataModel.getIfSubManualReceive())) && LeConstants.COMMON_YES.equals(Integer.valueOf(metadataModel.getIfSubRuleNoReceiveFailure()))) {
+         LocalDate useDate = timeStart <= today.getDayOfMonth() ? today.plusMonths(1L) : today;
+         LocalDateTime expiryDateTime = LocalDate.of(useDate.getYear(), useDate.getMonthValue(), timeStart).atTime(LocalTime.MIN);
+         String format = LocalDateTimeUtil.format(expiryDateTime, DatePattern.NORM_DATETIME_FORMATTER);
+         contentDes = "领取有效期至 " + format;
+      }
+
+      po.setContentDes(contentDes);
+      return po;
+   }
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public BigDecimal getAmount() {
+      return this.amount;
+   }
+
+   public Long getTimeId() {
+      return this.timeId;
+   }
+
+   public String getContentDes() {
+      return this.contentDes;
+   }
+
+   public Integer getReceiveType() {
+      return this.receiveType;
+   }
+
+   public AppPersonSubRuleVO setCustId(final Long custId) {
+      this.custId = custId;
+      return this;
+   }
+
+   public AppPersonSubRuleVO setAmount(final BigDecimal amount) {
+      this.amount = amount;
+      return this;
+   }
+
+   public AppPersonSubRuleVO setTimeId(final Long timeId) {
+      this.timeId = timeId;
+      return this;
+   }
+
+   public AppPersonSubRuleVO setTimeName(final String timeName) {
+      this.timeName = timeName;
+      return this;
+   }
+
+   public AppPersonSubRuleVO setContentDes(final String contentDes) {
+      this.contentDes = contentDes;
+      return this;
+   }
+
+   public AppPersonSubRuleVO setReceiveType(final Integer receiveType) {
+      this.receiveType = receiveType;
+      return this;
+   }
+
+   public String toString() {
+      Long var10000 = this.getCustId();
+      return "AppPersonSubRuleVO(custId=" + var10000 + ", amount=" + String.valueOf(this.getAmount()) + ", timeId=" + this.getTimeId() + ", timeName=" + this.getTimeName() + ", contentDes=" + this.getContentDes() + ", receiveType=" + this.getReceiveType() + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/app/vo/AppWorkWithdrawVO.java

@@ -0,0 +1,146 @@
+package com.bonus.canteen.core.account.v3.app.vo;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.bonus.canteen.core.account.v3.constants.AccDrawAuditEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+public class AppWorkWithdrawVO {
+   @ApiModelProperty("申请记录id")
+   private Long applyId;
+   @ApiModelProperty("申请时间")
+   private LocalDateTime applyDateTime;
+   @ApiModelProperty("审批时间")
+   private LocalDateTime approvalTime;
+   @ApiModelProperty("审批状态 1待审批 2审批同意 3审批拒绝")
+   private Integer auditStatus;
+   @ApiModelProperty("审批状态名称")
+   private String auditStatusName;
+   @ApiModelProperty("申请提现金额/分")
+   private Integer applyAmount;
+   @ApiModelProperty("实际到账金额/分")
+   private Integer actualAmount;
+   @ApiModelProperty("人员id")
+   private Long custId;
+   @ApiModelProperty("编号")
+   private String custNum;
+   @ApiModelProperty("姓名")
+   private String custName;
+   @ApiModelProperty("手机号")
+   private String mobile;
+   @ApiModelProperty("组织全称")
+   private String orgFullName;
+   @ApiModelProperty("个人钱包余额/分")
+   private BigDecimal walletBal;
+
+   public String getAuditStatusName() {
+      return ObjectUtil.isNotNull(this.auditStatus) ? AccDrawAuditEnum.getDesc(this.auditStatus) : this.auditStatusName;
+   }
+
+   public Long getApplyId() {
+      return this.applyId;
+   }
+
+   public LocalDateTime getApplyDateTime() {
+      return this.applyDateTime;
+   }
+
+   public LocalDateTime getApprovalTime() {
+      return this.approvalTime;
+   }
+
+   public Integer getAuditStatus() {
+      return this.auditStatus;
+   }
+
+   public Integer getApplyAmount() {
+      return this.applyAmount;
+   }
+
+   public Integer getActualAmount() {
+      return this.actualAmount;
+   }
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public String getCustNum() {
+      return this.custNum;
+   }
+
+   public String getCustName() {
+      return this.custName;
+   }
+
+   public String getMobile() {
+      return this.mobile;
+   }
+
+   public String getOrgFullName() {
+      return this.orgFullName;
+   }
+
+   public BigDecimal getWalletBal() {
+      return this.walletBal;
+   }
+
+   public void setApplyId(final Long applyId) {
+      this.applyId = applyId;
+   }
+
+   public void setApplyDateTime(final LocalDateTime applyDateTime) {
+      this.applyDateTime = applyDateTime;
+   }
+
+   public void setApprovalTime(final LocalDateTime approvalTime) {
+      this.approvalTime = approvalTime;
+   }
+
+   public void setAuditStatus(final Integer auditStatus) {
+      this.auditStatus = auditStatus;
+   }
+
+   public void setAuditStatusName(final String auditStatusName) {
+      this.auditStatusName = auditStatusName;
+   }
+
+   public void setApplyAmount(final Integer applyAmount) {
+      this.applyAmount = applyAmount;
+   }
+
+   public void setActualAmount(final Integer actualAmount) {
+      this.actualAmount = actualAmount;
+   }
+
+   public void setCustId(final Long custId) {
+      this.custId = custId;
+   }
+
+   public void setCustNum(final String custNum) {
+      this.custNum = custNum;
+   }
+
+   public void setCustName(final String custName) {
+      this.custName = custName;
+   }
+
+   public void setMobile(final String mobile) {
+      this.mobile = mobile;
+   }
+
+   public void setOrgFullName(final String orgFullName) {
+      this.orgFullName = orgFullName;
+   }
+
+   public void setWalletBal(final BigDecimal walletBal) {
+      this.walletBal = walletBal;
+   }
+
+   public String toString() {
+      Long var10000 = this.getApplyId();
+      return "AppWorkWithdrawVO(applyId=" + var10000 + ", applyDateTime=" + String.valueOf(this.getApplyDateTime()) + ", approvalTime=" + String.valueOf(this.getApprovalTime()) + ", auditStatus=" + this.getAuditStatus() + ", auditStatusName=" + this.getAuditStatusName() + ", applyAmount=" + this.getApplyAmount() + ", actualAmount=" + this.getActualAmount() + ", custId=" + this.getCustId() + ", custNum=" + this.getCustNum() + ", custName=" + this.getCustName() + ", mobile=" + this.getMobile() + ", walletBal=" + String.valueOf(this.getWalletBal()) + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/constants/AccDeductionUseTypeEnum.java

@@ -0,0 +1,51 @@
+package com.bonus.canteen.core.account.v3.constants;
+
+public enum AccDeductionUseTypeEnum {
+   PERSONAL(1, "小程序"),
+   EQUIPMENT(2, "设备");
+
+   private final Integer key;
+   private final String desc;
+
+   private AccDeductionUseTypeEnum(Integer key, String desc) {
+      this.key = key;
+      this.desc = desc;
+   }
+
+   public static String getDesc(Integer key) {
+      AccDeductionUseTypeEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccDeductionUseTypeEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp.getDesc();
+         }
+      }
+
+      return "";
+   }
+
+   public static AccDeductionUseTypeEnum getEnum(Integer key) {
+      AccDeductionUseTypeEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccDeductionUseTypeEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp;
+         }
+      }
+
+      return null;
+   }
+
+   public Integer getKey() {
+      return this.key;
+   }
+
+   public String getDesc() {
+      return this.desc;
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/constants/AccDrawAuditEnum.java

@@ -0,0 +1,70 @@
+package com.bonus.canteen.core.account.v3.constants;
+
+import cn.hutool.core.collection.ListUtil;
+
+import java.util.List;
+
+public enum AccDrawAuditEnum {
+   WAIT(1, "待审批"),
+   DOING(5, "审批中"),
+   ARGEE(2, "审批同意"),
+   REFUSE(3, "审批拒绝"),
+   CANCEL(4, "已取消");
+
+   private final Integer key;
+   private final String desc;
+
+   private AccDrawAuditEnum(Integer key, String desc) {
+      this.key = key;
+      this.desc = desc;
+   }
+
+   public static String getDesc(Integer key) {
+      AccDrawAuditEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccDrawAuditEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp.getDesc();
+         }
+      }
+
+      return "";
+   }
+
+   public static AccDrawAuditEnum getAuditEnum(Integer key) {
+      AccDrawAuditEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccDrawAuditEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp;
+         }
+      }
+
+      return null;
+   }
+
+   public static List<Integer> getStatusForAppWork() {
+      return ListUtil.toList(new Integer[]{WAIT.getKey(), DOING.getKey(), ARGEE.getKey(), REFUSE.getKey()});
+   }
+
+   public static boolean isFinishedState(Integer key) {
+      return ListUtil.toList(new Integer[]{ARGEE.getKey(), REFUSE.getKey(), CANCEL.getKey()}).contains(key);
+   }
+
+   public static boolean isWaitingState(Integer key) {
+      return ListUtil.toList(new Integer[]{WAIT.getKey(), DOING.getKey()}).contains(key);
+   }
+
+   public Integer getKey() {
+      return this.key;
+   }
+
+   public String getDesc() {
+      return this.desc;
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/constants/AccDrawAuditResultEnum.java

@@ -0,0 +1,75 @@
+package com.bonus.canteen.core.account.v3.constants;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.bonus.canteen.core.account.v3.model.AccDrawAudit;
+
+public enum AccDrawAuditResultEnum {
+   SUCCESS(1, "已到账"),
+   SUCCESS_PARTIAL(2, "部分到账"),
+   FAILED(3, "到账失败");
+
+   private final Integer key;
+   private final String desc;
+
+   private AccDrawAuditResultEnum(Integer key, String desc) {
+      this.key = key;
+      this.desc = desc;
+   }
+
+   public static String getDesc(Integer key) {
+      AccDrawAuditResultEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccDrawAuditResultEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp.getDesc();
+         }
+      }
+
+      return "";
+   }
+
+   public static AccDrawAuditResultEnum getAuditEnum(Integer key) {
+      if (ObjectUtil.isNull(key)) {
+         return null;
+      } else {
+         AccDrawAuditResultEnum[] var1 = values();
+         int var2 = var1.length;
+
+         for(int var3 = 0; var3 < var2; ++var3) {
+            AccDrawAuditResultEnum temp = var1[var3];
+            if (temp.getKey().equals(key)) {
+               return temp;
+            }
+         }
+
+         return null;
+      }
+   }
+
+   public static String getResult(Integer applyAmount, Integer actualAmount) {
+      if (actualAmount == 0) {
+         return FAILED.getDesc();
+      } else {
+         return applyAmount.equals(actualAmount) ? SUCCESS.getDesc() : SUCCESS_PARTIAL.getDesc();
+      }
+   }
+
+   public static AccDrawAuditResultEnum getResultEnum(AccDrawAudit accDrawAudit) {
+      if (accDrawAudit.getActualAmount() == 0) {
+         return FAILED;
+      } else {
+         return accDrawAudit.getActualAmount().equals(accDrawAudit.getApplyAmount()) ? SUCCESS : SUCCESS_PARTIAL;
+      }
+   }
+
+   public Integer getKey() {
+      return this.key;
+   }
+
+   public String getDesc() {
+      return this.desc;
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/constants/AccFrozenRuleEnum.java

@@ -0,0 +1,51 @@
+package com.bonus.canteen.core.account.v3.constants;
+
+public enum AccFrozenRuleEnum {
+   FROZEN(1, "冻结"),
+   UN_FROZEN(2, "解冻");
+
+   private final Integer key;
+   private final String desc;
+
+   private AccFrozenRuleEnum(Integer key, String desc) {
+      this.key = key;
+      this.desc = desc;
+   }
+
+   public static String getDesc(Integer key) {
+      AccFrozenRuleEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccFrozenRuleEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp.getDesc();
+         }
+      }
+
+      return "";
+   }
+
+   public static AccFrozenRuleEnum getEnum(Integer key) {
+      AccFrozenRuleEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccFrozenRuleEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp;
+         }
+      }
+
+      return null;
+   }
+
+   public Integer getKey() {
+      return this.key;
+   }
+
+   public String getDesc() {
+      return this.desc;
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/constants/AccOrdSourceTypeEnum.java

@@ -0,0 +1,37 @@
+package com.bonus.canteen.core.account.v3.constants;
+
+public enum AccOrdSourceTypeEnum {
+   APPLET(1, "小程序"),
+   DEVICE(2, "设备");
+
+   private final Integer key;
+   private final String desc;
+
+   private AccOrdSourceTypeEnum(Integer key, String desc) {
+      this.key = key;
+      this.desc = desc;
+   }
+
+   public static String getDesc(Integer key) {
+      AccOrdSourceTypeEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccOrdSourceTypeEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp.getDesc();
+         }
+      }
+
+      return "";
+   }
+
+   public Integer getKey() {
+      return this.key;
+   }
+
+   public String getDesc() {
+      return this.desc;
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/constants/AccRechargeResultEnum.java

@@ -0,0 +1,176 @@
+package com.bonus.canteen.core.account.v3.constants;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
+import com.bonus.canteen.core.pay.common.constants.PayStateEnum;
+import com.bonus.common.houqin.constant.LeConstants;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public enum AccRechargeResultEnum {
+   UN_PAY(1, "待支付"),
+   PAY_INPROCESS(2, "支付中"),
+   PAY_SUCC(3, "成功"),
+   PAY_FAIL(4, "失败"),
+   PAY_CLOSE(5, "关闭"),
+   PART_CANCEL(6, "已撤销");
+
+   private final Integer key;
+   private final String desc;
+
+   private AccRechargeResultEnum(Integer key, String desc) {
+      this.key = key;
+      this.desc = desc;
+   }
+
+   public static String getDesc(Integer key) {
+      AccRechargeResultEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccRechargeResultEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp.getDesc();
+         }
+      }
+
+      return "";
+   }
+
+   public static AccRechargeResultEnum getResultEnum(Integer key) {
+      AccRechargeResultEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccRechargeResultEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp;
+         }
+      }
+
+      return null;
+   }
+
+   public static Integer getRechargeResultState(Integer tradeState, Integer payState) {
+      AccTradeStateEnum stateEnum = AccTradeStateEnum.getStateEnum(tradeState);
+      Integer state = LeConstants.DATA_DEFAULT_INTEGER;
+      if (stateEnum != null) {
+         switch (stateEnum) {
+            case CREATE:
+               if (PayStateEnum.UN_PAY.getKey().equals(payState)) {
+                  state = UN_PAY.getKey();
+               } else {
+                  state = PAY_INPROCESS.getKey();
+               }
+               break;
+            case TAKE_EFFECT:
+               state = PAY_SUCC.getKey();
+               break;
+            case CLOSE:
+               if (PayStateEnum.PAY_FAIL.getKey().equals(payState)) {
+                  state = PAY_FAIL.getKey();
+               } else {
+                  state = PAY_CLOSE.getKey();
+               }
+               break;
+            case CANCELED:
+               state = PART_CANCEL.getKey();
+         }
+      }
+
+      return state;
+   }
+
+   public static String getRechargeResultName(Integer tradeState, Integer payState) {
+      AccTradeStateEnum stateEnum = AccTradeStateEnum.getStateEnum(tradeState);
+      String result = "";
+      if (stateEnum != null) {
+         switch (stateEnum) {
+            case CREATE:
+               if (PayStateEnum.UN_PAY.getKey().equals(payState)) {
+                  result = UN_PAY.getDesc();
+               } else {
+                  result = PAY_INPROCESS.getDesc();
+               }
+               break;
+            case TAKE_EFFECT:
+               result = PAY_SUCC.getDesc();
+               break;
+            case CLOSE:
+               if (PayStateEnum.PAY_FAIL.getKey().equals(payState)) {
+                  result = PAY_FAIL.getDesc();
+               } else {
+                  result = PAY_CLOSE.getDesc();
+               }
+               break;
+            case CANCELED:
+               result = PART_CANCEL.getDesc();
+         }
+      }
+
+      return result;
+   }
+
+   public static Map<String, List<Integer>> assembleWalletRechargeQuery(List<Integer> rechargeResultStates) {
+      if (CollUtil.isEmpty(rechargeResultStates)) {
+         return Maps.newHashMap();
+      } else {
+         List<Integer> tradeStateList = Lists.newArrayList();
+         List<Integer> payStateList = Lists.newArrayList();
+         rechargeResultStates.forEach((state) -> {
+            AccRechargeResultEnum resultEnum = getResultEnum(state);
+            if (resultEnum != null) {
+               switch (resultEnum.ordinal()) {
+                  case 0:
+                     tradeStateList.add(AccTradeStateEnum.CREATE.getKey());
+                     payStateList.add(PayStateEnum.UN_PAY.getKey());
+                     break;
+                  case 1:
+                     tradeStateList.add(AccTradeStateEnum.CREATE.getKey());
+                     payStateList.add(PayStateEnum.PAY_INPROCESS.getKey());
+                     break;
+                  case 2:
+                     tradeStateList.add(AccTradeStateEnum.TAKE_EFFECT.getKey());
+                     payStateList.add(PayStateEnum.PAY_SUCC.getKey());
+                     payStateList.add(PayStateEnum.PART_PAY.getKey());
+                     break;
+                  case 3:
+                     tradeStateList.add(AccTradeStateEnum.CLOSE.getKey());
+                     payStateList.add(PayStateEnum.PAY_FAIL.getKey());
+                     break;
+                  case 4:
+                     tradeStateList.add(AccTradeStateEnum.CLOSE.getKey());
+                     payStateList.add(PayStateEnum.PAY_CLOSE.getKey());
+                     break;
+                  case 5:
+                     tradeStateList.add(AccTradeStateEnum.CANCELED.getKey());
+                     payStateList.add(PayStateEnum.PAY_SUCC.getKey());
+               }
+            }
+
+         });
+         HashMap<String, List<Integer>> result = MapUtil.newHashMap();
+         result.put("tradeState", tradeStateList.stream().distinct().collect(Collectors.toList()));
+         result.put("payState", payStateList.stream().distinct().collect(Collectors.toList()));
+         return result;
+      }
+   }
+
+   public Integer getKey() {
+      return this.key;
+   }
+
+   public String getDesc() {
+      return this.desc;
+   }
+
+   // $FF: synthetic method
+   private static AccRechargeResultEnum[] $values() {
+      return new AccRechargeResultEnum[]{UN_PAY, PAY_INPROCESS, PAY_SUCC, PAY_FAIL, PAY_CLOSE, PART_CANCEL};
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/constants/AccRechargeRevokeSourceEnum.java

@@ -0,0 +1,52 @@
+package com.bonus.canteen.core.account.v3.constants;
+
+public enum AccRechargeRevokeSourceEnum {
+   WEB_RECHARGE_REVOKE(20, "管理员充值撤销"),
+   OPEN_RECHARGE_REVOKE(30, "OpenApi"),
+   MOBILE_WITHDRAW_REVOKE(40, "移动端提现");
+
+   private final Integer key;
+   private final String desc;
+
+   private AccRechargeRevokeSourceEnum(Integer key, String desc) {
+      this.key = key;
+      this.desc = desc;
+   }
+
+   public static String getDesc(Integer key) {
+      AccRechargeRevokeSourceEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccRechargeRevokeSourceEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp.getDesc();
+         }
+      }
+
+      return "";
+   }
+
+   public static AccRechargeRevokeSourceEnum getEnum(Integer key) {
+      AccRechargeRevokeSourceEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccRechargeRevokeSourceEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp;
+         }
+      }
+
+      return null;
+   }
+
+   public Integer getKey() {
+      return this.key;
+   }
+
+   public String getDesc() {
+      return this.desc;
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/constants/AccRuleRangeEnum.java

@@ -0,0 +1,51 @@
+package com.bonus.canteen.core.account.v3.constants;
+
+public enum AccRuleRangeEnum {
+   ORG(3, "组织"),
+   PSN(4, "人员类别");
+
+   private final Integer key;
+   private final String desc;
+
+   private AccRuleRangeEnum(Integer key, String desc) {
+      this.key = key;
+      this.desc = desc;
+   }
+
+   public static String getDesc(Integer key) {
+      AccRuleRangeEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccRuleRangeEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp.getDesc();
+         }
+      }
+
+      return "";
+   }
+
+   public static AccRuleRangeEnum getEnum(Integer key) {
+      AccRuleRangeEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccRuleRangeEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp;
+         }
+      }
+
+      return null;
+   }
+
+   public Integer getKey() {
+      return this.key;
+   }
+
+   public String getDesc() {
+      return this.desc;
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/constants/AccSubArrivalTypeEnum.java

@@ -0,0 +1,51 @@
+package com.bonus.canteen.core.account.v3.constants;
+
+public enum AccSubArrivalTypeEnum {
+   IMMEDIATELY(1, "立即到账"),
+   MANUAL(2, "手动领取");
+
+   private final Integer key;
+   private final String desc;
+
+   private AccSubArrivalTypeEnum(Integer key, String desc) {
+      this.key = key;
+      this.desc = desc;
+   }
+
+   public static String getDesc(Integer key) {
+      AccSubArrivalTypeEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccSubArrivalTypeEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp.getDesc();
+         }
+      }
+
+      return "";
+   }
+
+   public static AccSubArrivalTypeEnum getEnum(Integer key) {
+      AccSubArrivalTypeEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccSubArrivalTypeEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp;
+         }
+      }
+
+      return null;
+   }
+
+   public Integer getKey() {
+      return this.key;
+   }
+
+   public String getDesc() {
+      return this.desc;
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/constants/AccSubHandReceiveEnum.java

@@ -0,0 +1,39 @@
+package com.bonus.canteen.core.account.v3.constants;
+
+public enum AccSubHandReceiveEnum {
+   NO_RECEIVE(1, "未到账"),
+   DONE_RECEIVE(2, "已到账"),
+   EXPIRED_RECEIVE(3, "已过期"),
+   CANCEL_RECEIVE(4, "已撤销");
+
+   private final Integer key;
+   private final String desc;
+
+   private AccSubHandReceiveEnum(Integer key, String desc) {
+      this.key = key;
+      this.desc = desc;
+   }
+
+   public static String getDesc(Integer key) {
+      AccSubHandReceiveEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccSubHandReceiveEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp.getDesc();
+         }
+      }
+
+      return "";
+   }
+
+   public Integer getKey() {
+      return this.key;
+   }
+
+   public String getDesc() {
+      return this.desc;
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/constants/AccWalletClearTypeEnum.java

@@ -0,0 +1,44 @@
+package com.bonus.canteen.core.account.v3.constants;
+
+import java.util.Arrays;
+
+public enum AccWalletClearTypeEnum {
+   CLEAR(1, "清空"),
+   RESERVE(2, "清空至");
+
+   private final Integer key;
+   private final String desc;
+
+   private AccWalletClearTypeEnum(Integer key, String desc) {
+      this.key = key;
+      this.desc = desc;
+   }
+
+   public static String getDesc(Integer key) {
+      AccWalletClearTypeEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccWalletClearTypeEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp.getDesc();
+         }
+      }
+
+      return "";
+   }
+
+   public static boolean ifClearEnum(Integer key) {
+      return Arrays.stream(values()).anyMatch((e) -> {
+         return e.getKey().equals(key);
+      });
+   }
+
+   public Integer getKey() {
+      return this.key;
+   }
+
+   public String getDesc() {
+      return this.desc;
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/constants/AccWalletFrozenTypeEnum.java

@@ -0,0 +1,23 @@
+package com.bonus.canteen.core.account.v3.constants;
+
+public enum AccWalletFrozenTypeEnum {
+   FROZEN(1, "冻结/解冻"),
+   RESERVE(2, "冻结至/解冻至");
+
+   private final Integer key;
+   private final String desc;
+
+   private AccWalletFrozenTypeEnum(Integer key, String desc) {
+      this.key = key;
+      this.desc = desc;
+   }
+
+   public Integer getKey() {
+      return this.key;
+   }
+
+   public String getDesc() {
+      return this.desc;
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/constants/AccWithdrawSourceEnum.java

@@ -0,0 +1,39 @@
+package com.bonus.canteen.core.account.v3.constants;
+
+public enum AccWithdrawSourceEnum {
+   APPLET(1, "小程序"),
+   WEB(2, "web端"),
+   WEB_CANCEL(4, "注销提现"),
+   OPEN(3, "OpenApi");
+
+   private final Integer key;
+   private final String desc;
+
+   private AccWithdrawSourceEnum(Integer key, String desc) {
+      this.key = key;
+      this.desc = desc;
+   }
+
+   public static String getDesc(Integer key) {
+      AccWithdrawSourceEnum[] var1 = values();
+      int var2 = var1.length;
+
+      for(int var3 = 0; var3 < var2; ++var3) {
+         AccWithdrawSourceEnum temp = var1[var3];
+         if (temp.getKey().equals(key)) {
+            return temp.getDesc();
+         }
+      }
+
+      return "";
+   }
+
+   public Integer getKey() {
+      return this.key;
+   }
+
+   public String getDesc() {
+      return this.desc;
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/extension/ThirdAccountExtensionService.java

@@ -0,0 +1,33 @@
+package com.bonus.canteen.core.account.v3.extension;
+
+
+import com.bonus.canteen.core.account.v3.extension.dto.ThirdAccountSupportDTO;
+import com.bonus.canteen.core.account.v3.extension.dto.ThirdBalanceDTO;
+import com.bonus.canteen.core.account.v3.extension.dto.ThirdRechargeDTO;
+import com.bonus.canteen.core.account.v3.extension.vo.ThirdAccountSupportVO;
+import com.bonus.canteen.core.account.v3.extension.vo.ThirdBalanceVO;
+import com.bonus.canteen.core.account.v3.extension.vo.ThirdRechargeVO;
+import com.bonus.common.core.exception.ServiceException;
+import com.bonus.common.houqin.i18n.I18n;
+
+public interface ThirdAccountExtensionService {
+   default ThirdBalanceVO getBalance(ThirdBalanceDTO thirdBalanceDTO) {
+      throw new ServiceException(I18n.getMessage("acc_not_support_function"));
+   }
+
+   default ThirdRechargeVO recharge(ThirdRechargeDTO thirdRechargeDTO) {
+      throw new ServiceException(I18n.getMessage("acc_not_support_function"));
+   }
+
+   default ThirdAccountSupportVO supportThirdAccount(ThirdAccountSupportDTO thirdAccountSupportDTO) {
+      throw new ServiceException(I18n.getMessage("acc_not_support_function"));
+   }
+
+   default ThirdAccountSupportVO supportThirdCard(ThirdAccountSupportDTO thirdAccountSupportDTO) {
+      throw new ServiceException(I18n.getMessage("acc_not_support_function"));
+   }
+
+   default ThirdAccountSupportVO supportThirdQR(ThirdAccountSupportDTO thirdAccountSupportDTO) {
+      throw new ServiceException(I18n.getMessage("acc_not_support_function"));
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/extension/dto/ThirdAccountSupportDTO.java

@@ -0,0 +1,21 @@
+package com.bonus.canteen.core.account.v3.extension.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class ThirdAccountSupportDTO {
+   @ApiModelProperty("人员类别")
+   private Integer psnType;
+
+   public Integer getPsnType() {
+      return this.psnType;
+   }
+
+   public ThirdAccountSupportDTO setPsnType(final Integer psnType) {
+      this.psnType = psnType;
+      return this;
+   }
+
+   public String toString() {
+      return "ThirdAccountSupportDTO(psnType=" + this.getPsnType() + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/extension/dto/ThirdBalanceDTO.java

@@ -0,0 +1,161 @@
+package com.bonus.canteen.core.account.v3.extension.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class ThirdBalanceDTO {
+   @ApiModelProperty("小牛人员id")
+   private Long custId;
+   @ApiModelProperty("小牛卡号")
+   private String serialNum;
+   @ApiModelProperty("三方卡号")
+   private String thirdSerialNum;
+   @ApiModelProperty("三方二维码")
+   private String thirdAuthCode;
+   @ApiModelProperty("三方人员编号")
+   private String custThirdId;
+   @ApiModelProperty("人员类别")
+   private Integer psnType;
+   @ApiModelProperty("人员编号")
+   private String custNum;
+
+   public static ThirdBalanceDTOBuilder builder() {
+      return new ThirdBalanceDTOBuilder();
+   }
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public String getSerialNum() {
+      return this.serialNum;
+   }
+
+   public String getThirdSerialNum() {
+      return this.thirdSerialNum;
+   }
+
+   public String getThirdAuthCode() {
+      return this.thirdAuthCode;
+   }
+
+   public String getCustThirdId() {
+      return this.custThirdId;
+   }
+
+   public Integer getPsnType() {
+      return this.psnType;
+   }
+
+   public String getCustNum() {
+      return this.custNum;
+   }
+
+   public ThirdBalanceDTO setCustId(final Long custId) {
+      this.custId = custId;
+      return this;
+   }
+
+   public ThirdBalanceDTO setSerialNum(final String serialNum) {
+      this.serialNum = serialNum;
+      return this;
+   }
+
+   public ThirdBalanceDTO setThirdSerialNum(final String thirdSerialNum) {
+      this.thirdSerialNum = thirdSerialNum;
+      return this;
+   }
+
+   public ThirdBalanceDTO setThirdAuthCode(final String thirdAuthCode) {
+      this.thirdAuthCode = thirdAuthCode;
+      return this;
+   }
+
+   public ThirdBalanceDTO setCustThirdId(final String custThirdId) {
+      this.custThirdId = custThirdId;
+      return this;
+   }
+
+   public ThirdBalanceDTO setPsnType(final Integer psnType) {
+      this.psnType = psnType;
+      return this;
+   }
+
+   public ThirdBalanceDTO setCustNum(final String custNum) {
+      this.custNum = custNum;
+      return this;
+   }
+
+   public String toString() {
+      Long var10000 = this.getCustId();
+      return "ThirdBalanceDTO(custId=" + var10000 + ", serialNum=" + this.getSerialNum() + ", thirdSerialNum=" + this.getThirdSerialNum() + ", thirdAuthCode=" + this.getThirdAuthCode() + ", custThirdId=" + this.getCustThirdId() + ", psnType=" + this.getPsnType() + ", custNum=" + this.getCustNum() + ")";
+   }
+
+   public ThirdBalanceDTO() {
+   }
+
+   public ThirdBalanceDTO(final Long custId, final String serialNum, final String thirdSerialNum, final String thirdAuthCode, final String custThirdId, final Integer psnType, final String custNum) {
+      this.custId = custId;
+      this.serialNum = serialNum;
+      this.thirdSerialNum = thirdSerialNum;
+      this.thirdAuthCode = thirdAuthCode;
+      this.custThirdId = custThirdId;
+      this.psnType = psnType;
+      this.custNum = custNum;
+   }
+
+   public static class ThirdBalanceDTOBuilder {
+      private Long custId;
+      private String serialNum;
+      private String thirdSerialNum;
+      private String thirdAuthCode;
+      private String custThirdId;
+      private Integer psnType;
+      private String custNum;
+
+      ThirdBalanceDTOBuilder() {
+      }
+
+      public ThirdBalanceDTOBuilder custId(final Long custId) {
+         this.custId = custId;
+         return this;
+      }
+
+      public ThirdBalanceDTOBuilder serialNum(final String serialNum) {
+         this.serialNum = serialNum;
+         return this;
+      }
+
+      public ThirdBalanceDTOBuilder thirdSerialNum(final String thirdSerialNum) {
+         this.thirdSerialNum = thirdSerialNum;
+         return this;
+      }
+
+      public ThirdBalanceDTOBuilder thirdAuthCode(final String thirdAuthCode) {
+         this.thirdAuthCode = thirdAuthCode;
+         return this;
+      }
+
+      public ThirdBalanceDTOBuilder custThirdId(final String custThirdId) {
+         this.custThirdId = custThirdId;
+         return this;
+      }
+
+      public ThirdBalanceDTOBuilder psnType(final Integer psnType) {
+         this.psnType = psnType;
+         return this;
+      }
+
+      public ThirdBalanceDTOBuilder custNum(final String custNum) {
+         this.custNum = custNum;
+         return this;
+      }
+
+      public ThirdBalanceDTO build() {
+         return new ThirdBalanceDTO(this.custId, this.serialNum, this.thirdSerialNum, this.thirdAuthCode, this.custThirdId, this.psnType, this.custNum);
+      }
+
+      public String toString() {
+         return "ThirdBalanceDTO.ThirdBalanceDTOBuilder(custId=" + this.custId + ", serialNum=" + this.serialNum + ", thirdSerialNum=" + this.thirdSerialNum + ", thirdAuthCode=" + this.thirdAuthCode + ", custThirdId=" + this.custThirdId + ", psnType=" + this.psnType + ", custNum=" + this.custNum + ")";
+      }
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/extension/dto/ThirdRechargeDTO.java

@@ -0,0 +1,7 @@
+package com.bonus.canteen.core.account.v3.extension.dto;
+
+public class ThirdRechargeDTO {
+   public String toString() {
+      return "ThirdRechargeDTO()";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/extension/vo/ThirdAccountSupportVO.java

@@ -0,0 +1,30 @@
+package com.bonus.canteen.core.account.v3.extension.vo;
+
+import com.bonus.common.houqin.constant.LeConstants;
+import io.swagger.annotations.ApiModelProperty;
+
+public class ThirdAccountSupportVO {
+   @ApiModelProperty("是否支持 1是 2否 必填")
+   private Integer ifSupport;
+
+   public boolean support() {
+      return LeConstants.COMMON_YES.equals(this.ifSupport);
+   }
+
+   public static ThirdAccountSupportVO defaultSupport() {
+      return (new ThirdAccountSupportVO()).setIfSupport(LeConstants.COMMON_YES);
+   }
+
+   public Integer getIfSupport() {
+      return this.ifSupport;
+   }
+
+   public ThirdAccountSupportVO setIfSupport(final Integer ifSupport) {
+      this.ifSupport = ifSupport;
+      return this;
+   }
+
+   public String toString() {
+      return "ThirdAccountSupportVO(ifSupport=" + this.getIfSupport() + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/extension/vo/ThirdBalanceVO.java

@@ -0,0 +1,35 @@
+package com.bonus.canteen.core.account.v3.extension.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+public class ThirdBalanceVO {
+   @ApiModelProperty("三方账户余额 单位分")
+   private BigDecimal thirdAccountBalance;
+   @ApiModelProperty("三方用户id")
+   private String custThirdId;
+
+   public BigDecimal getThirdAccountBalance() {
+      return this.thirdAccountBalance;
+   }
+
+   public String getCustThirdId() {
+      return this.custThirdId;
+   }
+
+   public ThirdBalanceVO setThirdAccountBalance(final BigDecimal thirdAccountBalance) {
+      this.thirdAccountBalance = thirdAccountBalance;
+      return this;
+   }
+
+   public ThirdBalanceVO setCustThirdId(final String custThirdId) {
+      this.custThirdId = custThirdId;
+      return this;
+   }
+
+   public String toString() {
+      String var10000 = String.valueOf(this.getThirdAccountBalance());
+      return "ThirdBalanceVO(thirdAccountBalance=" + var10000 + ", custThirdId=" + this.getCustThirdId() + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/extension/vo/ThirdRechargeVO.java

@@ -0,0 +1,7 @@
+package com.bonus.canteen.core.account.v3.extension.vo;
+
+public class ThirdRechargeVO {
+   public String toString() {
+      return "ThirdRechargeVO()";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccDeductionConfMapper.java

@@ -0,0 +1,17 @@
+package com.bonus.canteen.core.account.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.bonus.canteen.core.account.v3.model.AccDeductionConf;
+import com.bonus.canteen.core.account.v3.web.dto.AccDeductionConfListDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccDeductionConfVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface AccDeductionConfMapper extends BaseMapper<AccDeductionConf> {
+   List<AccDeductionConfVO> listAccDeductionConf(@Param("param") AccDeductionConfListDTO param);
+
+   List<Integer> listAccDeductionConfWalletId(@Param("param") AccDeductionConfListDTO param);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccDrawAuditMapper.java

@@ -0,0 +1,74 @@
+package com.bonus.canteen.core.account.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bonus.canteen.core.account.v3.app.dto.AppDrawAuditPageDTO;
+import com.bonus.canteen.core.account.v3.app.dto.AppWorkWithdrawPageDTO;
+import com.bonus.canteen.core.account.v3.app.vo.AppDrawAuditPageVO;
+import com.bonus.canteen.core.account.v3.app.vo.AppWorkWithdrawVO;
+import com.bonus.canteen.core.account.v3.model.AccDrawAudit;
+import com.bonus.canteen.core.account.v3.web.dto.AccPendingCountDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccWithDrawPageDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccWithDrawApplyPageVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccWithDrawApplyV4PageVO;
+import com.bonus.canteen.core.auth.config.LeNiuDataPermission;
+import com.bonus.canteen.core.auth.enums.DataPermissionTypeEnum;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface AccDrawAuditMapper extends BaseMapper<AccDrawAudit> {
+   @LeNiuDataPermission(
+      alias = "t2",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   Page<AccWithDrawApplyPageVO> queryWithdrawApplyRecordPage(Page<?> page, @Param("param") AccWithDrawPageDTO content);
+
+   @LeNiuDataPermission(
+      alias = "t2",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccWithDrawApplyPageVO> queryWithdrawApplyRecordList(@Param("param") AccWithDrawPageDTO content);
+
+   @LeNiuDataPermission(
+      alias = "t1",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   Page<AccWithDrawApplyPageVO> queryWithdrawApplyApprovalRecordPage(Page<?> page, @Param("param") AccWithDrawPageDTO content);
+
+   @LeNiuDataPermission(
+      alias = "t1",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccWithDrawApplyPageVO queryWithdrawApplyApprovalRecordTotal(@Param("param") AccWithDrawPageDTO content);
+
+   @LeNiuDataPermission(
+      alias = "t1",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccWithDrawApplyPageVO> queryWithdrawApplyApprovalRecordList(@Param("param") AccWithDrawPageDTO content);
+
+   Page<AppDrawAuditPageVO> queryPageAccDrawAuditForApp(Page<?> page, @Param("pageDTO") AppDrawAuditPageDTO pageDTO);
+
+   @LeNiuDataPermission(
+      alias = "t2",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   Page<AppWorkWithdrawVO> queryAccWithDrawPageForAppWork(Page<?> page, @Param("param") AppWorkWithdrawPageDTO pageDTO);
+
+   Long monitorPendingCount(@Param("param") AccPendingCountDTO content);
+
+   @LeNiuDataPermission(
+      alias = "t2",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccWithDrawApplyV4PageVO> listAccWithDrawApplyV4(@Param("param") AccWithDrawPageDTO content);
+
+   @LeNiuDataPermission(
+      alias = "t2",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccWithDrawApplyV4PageVO sumAccWithDrawApplyV4(@Param("param") AccWithDrawPageDTO content);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccExceptionRecordMapper.xml

@@ -33,10 +33,10 @@
         t1.serial_num,
         t1.amount AS realAmount,
         t1.remark AS errorMsg,
-        t2.cust_name,
+        t2.nick_name as cust_name,
         t2.cust_num,
-        t2.mobile,
-        t2.org_full_name,
+        t2.phonenumber as mobile,
+        sd.dept_full_name as org_full_name,
         t4.order_id,
         t4.mac_order_id,
         t4.order_time,
@@ -50,7 +50,8 @@
         t4.nu_clear_mode
         FROM
         acc_exception_record AS t1
-        LEFT JOIN cust_info AS t2 ON t1.cust_id = t2.cust_id
+        LEFT JOIN sys_user AS t2 ON t1.cust_id = t2.cust_id
+        LEFT JOIN sys_dept sd ON t2.dept_id = sd.dept_id
         LEFT JOIN trade_order_recharge AS t3 ON t3.trade_id = t1.relation_id
         LEFT JOIN order_info AS t4 ON t4.order_id = t3.order_recharge_id
         LEFT JOIN device_info t5 ON t5.device_sn = t4.machine_sn
@@ -64,7 +65,7 @@
         SUM(t1.amount) AS realAmount
         FROM
         acc_exception_record AS t1
-        LEFT JOIN cust_info AS t2 ON t1.cust_id = t2.cust_id
+        LEFT JOIN sys_user AS t2 ON t1.cust_id = t2.cust_id
         LEFT JOIN trade_order_recharge AS t3 ON t3.trade_id = t1.relation_id
         LEFT JOIN order_info AS t4 ON t4.order_id = t3.order_recharge_id
         LEFT JOIN device_info t5 ON t5.device_sn = t4.machine_sn
@@ -86,10 +87,10 @@
             </if>
             <if test="param.keyword != null and param.keyword != '' ">
                 and (t2.cust_num LIKE CONCAT('%', #{param.keyword},'%')
-                    or t2.cust_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
-                    or t2.mobile = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
-                    or t2.mobile_suffix = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
-                    or t2.cust_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%')
+                    or t2.nick_name = #{param.keyword}
+                    or t2.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
+                <!--     or t2.mobile_suffix = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} -->
+                    or t2.nick_name_like LIKE CONCAT('%',#{param.keyword},'%')
                 )
             </if>
             <if test="param.macOrderId != null">

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccInfoMapper.java

@@ -32,27 +32,27 @@ import java.util.List;
 public interface AccInfoMapper extends BaseMapper<AccInfo> {
    @LeNiuDataPermission(
            alias = "t2",
-           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+           permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
    )
    List<AccInfoPageVO> queryListAccInfo(@Param("infoParam") AccInfoPageDTO content);
 
    @LeNiuDataPermission(
            alias = "t2",
-           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+           permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
    )
    AccInfoPageVO queryPageAccInfoSum(@Param("infoParam") AccInfoPageDTO content);
 
    @LeNiuDataPermission(
            alias = "t2",
-           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+           permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
    )
    List<AccInfoPageVO> queryPageAccInfoForBatch(@Param("infoParam") AccInfoPageDTO accPageParam);
 
-   @LeNiuDataPermission(
-           alias = "t2",
-           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
-   )
-   List<Long> queryAccIdByParam(@Param("infoParam") AccInfoPageDTO accPageParam);
+//   @LeNiuDataPermission(
+//           alias = "t2",
+//           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+//   )
+//   List<Long> queryAccIdByParam(@Param("infoParam") AccInfoPageDTO accPageParam);
 
    Integer updateStateByOverdue(@Param("overdueDate") LocalDate overdueDate, @Param("changeStatus") Integer changeStatus, @Param("oldStatusList") List<Integer> oldStatusList);
 
@@ -63,8 +63,8 @@ public interface AccInfoMapper extends BaseMapper<AccInfo> {
    List<AccInfoVO> listAccInfoVOByCustIdList(@Param("custIdList") List<Long> custIdList);
 
    @LeNiuDataPermission(
-           alias = "ci",
-           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+           alias = "t2",
+           permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
    )
    Page<AccExistFrozenListVO> queryFrozenAccPage(Page<?> page, @Param("infoParam") AccExistFrozenPageDTO pageDTO);
 
@@ -72,13 +72,13 @@ public interface AccInfoMapper extends BaseMapper<AccInfo> {
 
    List<AccInfoDetailVO> getAccInfoDetailVOV2();
 
-   AccInfoOpenPO getAccInfoOpenPOByCustId(@Param("custId") Long custId);
+//   AccInfoOpenPO getAccInfoOpenPOByCustId(@Param("custId") Long custId);
 
-   List<AccInfoOpenPO> queryPageAccInfoOpenPO(@Param("custIdList") List<Long> custIdList);
+//   List<AccInfoOpenPO> queryPageAccInfoOpenPO(@Param("custIdList") List<Long> custIdList);
 
    List<AccInfoVO> queryAccStatusAndCard(@Param("custIdList") List<Long> custIdList);
 
-   List<AccInfoVO> queryAccBaseInfoList(@Param("custIdList") List<Long> custIdList);
+//   List<AccInfoVO> queryAccBaseInfoList(@Param("custIdList") List<Long> custIdList);
 
    List<AccStatusChangeModel> queryAccStatusByCustIdList(@Param("custIdList") List<Long> custIdList);
 
@@ -88,17 +88,19 @@ public interface AccInfoMapper extends BaseMapper<AccInfo> {
 
    AccCountStatisticsVO accCountStatistics(@Param("param") AccStatisticsSumDTO accStatisticsSumDTO, @Param("authPO") MgrUserAuthPO authPO);
 
-   List<AccCountStatisticsVO> accCountStatisticsV2(@Param("param") AccStatisticsSumDTO accStatisticsSumDTO);
+//   List<AccCountStatisticsVO> accCountStatisticsV2(@Param("param") AccStatisticsSumDTO accStatisticsSumDTO);
 
    AccCardStatisticsVO accCardStatistics(@Param("param") AccStatisticsSumDTO accStatisticsSumDTO, @Param("authPO") MgrUserAuthPO authPO);
 
-   List<AccCardStatisticsVO> accCardStatisticsV2(@Param("param") AccStatisticsSumDTO accStatisticsSumDTO);
+//   List<AccCardStatisticsVO> accCardStatisticsV2(@Param("param") AccStatisticsSumDTO accStatisticsSumDTO);
 
    @LeNiuDataPermission(
            alias = "t2",
-           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+           permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
    )
    Page<AppWorkAccInfoVO> queryPageAccInfoForAppWork(Page<AppWorkAccInfoVO> page, @Param("infoParam") AppWorkAccInfoPageDTO pageDTO);
 
    Integer queryAccInfoExpiredCount(@Param("startDateTime") LocalDateTime startDateTime, @Param("endDateTime") LocalDateTime endDateTime, @Param("accStatus") Integer accStatus);
+
+   List<AccInfoVO> queryAccBaseInfoList(@Param("custIdList") List<Long> custIdList);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccOperationRecordMapper.java

@@ -0,0 +1,28 @@
+package com.bonus.canteen.core.account.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bonus.canteen.core.account.v3.model.AccOperationRecord;
+import com.bonus.canteen.core.account.v3.web.dto.AccOperationRecordPageDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccOperationRecordPageVO;
+import com.bonus.canteen.core.auth.config.LeNiuDataPermission;
+import com.bonus.canteen.core.auth.enums.DataPermissionTypeEnum;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface AccOperationRecordMapper extends BaseMapper<AccOperationRecord> {
+   @LeNiuDataPermission(
+      alias = "t2",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   Page<AccOperationRecordPageVO> listForPage(Page<Object> page, @Param("content") AccOperationRecordPageDTO content);
+
+   @LeNiuDataPermission(
+      alias = "t2",
+      permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
+   )
+   List<AccOperationRecordPageVO> listForExport(@Param("content") AccOperationRecordPageDTO content);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccRepairErrorMapper.java

@@ -0,0 +1,28 @@
+package com.bonus.canteen.core.account.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bonus.canteen.core.account.v3.model.AccRepairError;
+import com.bonus.canteen.core.account.v3.web.dto.AccRepairErrorPageDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccRepairErrorPageVO;
+import com.bonus.canteen.core.auth.config.LeNiuDataPermission;
+import com.bonus.canteen.core.auth.enums.DataPermissionTypeEnum;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface AccRepairErrorMapper extends BaseMapper<AccRepairError> {
+   @LeNiuDataPermission(
+      alias = "ci",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   Page<AccRepairErrorPageVO> queryAccRepairErrorPage(Page<AccRepairError> page, @Param("param") AccRepairErrorPageDTO pageDTO);
+
+   @LeNiuDataPermission(
+      alias = "ci",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccRepairErrorPageVO> queryAccRepairErrorList(@Param("param") AccRepairErrorPageDTO pageDTO);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccSubHandReceiveMapper.java

@@ -0,0 +1,37 @@
+package com.bonus.canteen.core.account.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bonus.canteen.core.account.v3.model.AccSubHandReceive;
+import com.bonus.canteen.core.account.v3.web.dto.AccSubHandReceivePageDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccSubHandReceivePageVO;
+import com.bonus.canteen.core.auth.config.LeNiuDataPermission;
+import com.bonus.canteen.core.auth.enums.DataPermissionTypeEnum;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Mapper
+public interface AccSubHandReceiveMapper extends BaseMapper<AccSubHandReceive> {
+   void updateExpiredSubHandReceive(@Param("overdueDate") LocalDate overdueDate);
+
+   @LeNiuDataPermission(
+      alias = "t2",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   Page<AccSubHandReceivePageVO> queryAccSubHandReceivePage(Page<AccSubHandReceive> page, @Param("param") AccSubHandReceivePageDTO content);
+
+   @LeNiuDataPermission(
+      alias = "t2",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccSubHandReceivePageVO> listAccSubHandReceive(@Param("param") AccSubHandReceivePageDTO content);
+
+   @LeNiuDataPermission(
+      alias = "t2",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccSubHandReceivePageVO queryAccSubHandReceivePageTotal(@Param("param") AccSubHandReceivePageDTO content);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccSubTimeMapper.java

@@ -0,0 +1,24 @@
+package com.bonus.canteen.core.account.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bonus.canteen.core.account.v3.model.AccSubTime;
+import com.bonus.canteen.core.account.v3.web.dto.AccSubTimePageDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccSubTimePageVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface AccSubTimeMapper extends BaseMapper<AccSubTime> {
+   Page<AccSubTimePageVO> queryAccSubTimePage(Page<AccSubTime> page, @Param("content") AccSubTimePageDTO pageDTO);
+
+   List<AccSubTimePageVO> listAccSubRuleByTimeStart(@Param("day") Integer day, @Param("searchDate") String searchDate);
+
+   List<AccSubTime> appMonthPersonList(@Param("today") Integer today);
+
+   List<AccSubTime> listStartSubRule(@Param("sendType") Integer sendType);
+
+   AccSubTime getOneByTimeId(@Param("timeId") Long timeId);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccSubTimeRangeMapper.java

@@ -0,0 +1,18 @@
+package com.bonus.canteen.core.account.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.bonus.canteen.core.account.v3.model.AccSubTimeRange;
+import com.bonus.canteen.core.account.v3.web.vo.AccSubTimeRangeVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface AccSubTimeRangeMapper extends BaseMapper<AccSubTimeRange> {
+   void insertAccSubRuleRangeByList(@Param("list") List<AccSubTimeRange> list);
+
+   void deleteAccSubRuleRangeByRuleId(@Param("ruleId") Long ruleId);
+
+   List<AccSubTimeRangeVO> listRangeForTimeIds(@Param("timeIds") List<Long> timeIds);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccSubTimeReceiveHistMapper.java

@@ -0,0 +1,20 @@
+package com.bonus.canteen.core.account.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.bonus.canteen.core.account.v3.model.AccSubTimeReceiveHist;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Mapper
+public interface AccSubTimeReceiveHistMapper extends BaseMapper<AccSubTimeReceiveHist> {
+   void insertBatch(@Param("list") List<AccSubTimeReceiveHist> histList);
+
+   List<Long> getCustListByTimeId(@Param("timeId") Long timeId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
+
+   int countCustTimeForAdvanceReceiveSub(@Param("custId") Long custId, @Param("timeId") Long timeId, @Param("subDate") LocalDate subDate);
+
+   List<AccSubTimeReceiveHist> selectNormalNotArriveSubByCustId(@Param("custId") Long custId);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccTradeCashErrorMapper.java

@@ -0,0 +1,15 @@
+package com.bonus.canteen.core.account.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.bonus.canteen.core.account.v3.model.AccTradeCashError;
+import com.bonus.canteen.core.account.v3.web.dto.AccTradeCashPageDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccTradeCashPageVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface AccTradeCashErrorMapper extends BaseMapper<AccTradeCashError> {
+   List<AccTradeCashPageVO> selectAccTradeCashErrorV4(@Param("param") AccTradeCashPageDTO param);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccTradeMapper.java

@@ -9,9 +9,17 @@ import com.bonus.canteen.core.account.v3.app.vo.AppAccTradePageVO;
 import com.bonus.canteen.core.account.v3.model.AccTrade;
 import com.bonus.canteen.core.account.v3.model.AccTradeWalletDetail;
 import com.bonus.canteen.core.account.v3.mq.send.model.RepAccMqModel;
+import com.bonus.canteen.core.account.v3.web.dto.*;
+import com.bonus.canteen.core.account.v3.web.vo.*;
+import com.bonus.canteen.core.account.v4.vo.AccWalletRepealV4PageVO;
+import com.bonus.canteen.core.auth.config.LeNiuDataPermission;
+import com.bonus.canteen.core.auth.enums.DataPermissionTypeEnum;
+import com.bonus.canteen.core.auth.po.MgrUserAuthPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Mapper
@@ -26,4 +34,194 @@ public interface AccTradeMapper extends BaseMapper<AccTrade> {
    AppAccTradePageVO getOneTradeApp(@Param("tradeId") Long tradeId);
 
    List<AccTradeWalletDetail> listAccSubsidyTrade(@Param("custId") Long custId, @Param("tradeTypeList") List<Integer> tradeTypeList);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccSubRechargePageVO> queryAccSubRechargeList(@Param("param") AccSubRechargePageDTO content);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccSubRechargePageVO getTotalAccSubRechargePage(@Param("param") AccSubRechargePageDTO content);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccSubClearPageVO> queryAccSubClearList(@Param("param") AccSubClearPageDTO content);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccSubClearPageVO getTotalAccSubClearPage(@Param("param") AccSubClearPageDTO content);
+
+   @LeNiuDataPermission(
+           alias = "ci",
+           permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
+   )
+   List<AccSubCollectVO> listAccSubRechargeCollectPageForCust(@Param("param") AccSubRechargeCollectDTO content);
+
+   List<AccSubCollectVO> listAccSubRechargeCollectForCustPsn(@Param("param") AccSubRechargeCollectDTO content);
+
+   @LeNiuDataPermission(
+           alias = "g",
+           permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
+   )
+   List<AccSubCollectVO> listAccSubRechargeCollectPageCustOrg(@Param("param") AccSubRechargeCollectDTO content);
+
+   AccSubCollectVO getTotalAccSubRechargeCollectAmountForCust(@Param("param") AccSubRechargeCollectDTO content, @Param("authPO") MgrUserAuthPO authPO);
+
+   AccSubCollectVO getTotalAccSubRechargeCollectAmount(@Param("param") AccSubRechargeCollectDTO content, @Param("authPO") MgrUserAuthPO authPO);
+
+   int getCustTimeForAdvanceReceiveSub(@Param("timeId") Long timeId, @Param("custId") Long custId, @Param("tradeType") Integer tradeType, @Param("firstDateTime") LocalDateTime firstDateTime, @Param("nowTime") LocalDateTime nowTime);
+
+   List<AccTradeAndDetailVO> listAccTrade(@Param("tradeIdList") List<Long> tradeIdList, @Param("batchNum") String batchNum, @Param("tradeType") Integer tradeType);
+
+   @LeNiuDataPermission(
+           alias = "ci",
+           permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
+   )
+   List<AccSubRepealPageVO> listRepealAccSubTrade(@Param("param") AccTradeRepealPageDTO content);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   BigDecimal getTotalRepealAccSubTradePage(@Param("param") AccTradeRepealPageDTO content);
+
+   List<Long> listCustIdForAdvanceReceiveSub(@Param("timeId") Long timeId, @Param("tradeType") Integer tradeType, @Param("firstDateTime") LocalDateTime firstDateTime, @Param("nowTime") LocalDateTime nowTime);
+
+   List<AccTrade> queryRechargeListByCustIdForWithdraw(@Param("custId") Long custId, @Param("lastRechargeId") Long lastRechargeId, @Param("tradeType") Integer tradeType);
+
+   @LeNiuDataPermission(
+           alias = "t1",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccWithdrawDetailPageVO> listAccWithdrawDetails(@Param("param") AccWithdrawDetailPageDTO content);
+
+   @LeNiuDataPermission(
+           alias = "t1",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccWithdrawDetailPageVO getTotalWithdrawAmount(@Param("param") AccWithdrawDetailPageDTO content);
+
+   @LeNiuDataPermission(
+           alias = "t1",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccWithdrawTradeTypePageVO> queryTradeTypeAccWithdrawSumList(@Param("param") AccWithdrawPageSumDTO content);
+
+   @LeNiuDataPermission(
+           alias = "t1",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccWithdrawTradeTypePageVO queryTradeTypeAccWithdrawAmountSum(@Param("param") AccWithdrawPageSumDTO content);
+
+   @LeNiuDataPermission(
+           alias = "t1",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccWithdrawPageVO> queryAccWithdrawListSum(@Param("param") AccWithdrawPageSumDTO content);
+
+   @LeNiuDataPermission(
+           alias = "t1",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccWithdrawPageVO queryAccWithdrawSumTotalAmount(@Param("param") AccWithdrawPageSumDTO content);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccTransferPageVO> queryAccTransferList(@Param("param") AccTransferPageDTO content);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccTransferPageVO getTotalAccTransferPage(@Param("param") AccTransferPageDTO content);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccFrozenPageVO> queryAccFrozenPageList(@Param("param") AccFrozenPageDTO content);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   BigDecimal getTotalAccFrozenPage(@Param("param") AccFrozenPageDTO content);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccUnFrozenPageVO> queryAccUnFrozenPageList(@Param("param") AccFrozenPageDTO content);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccRedRechargePageVO> queryAccRedRechargeList(@Param("param") AccRedRechargePageDTO content);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccRedRechargePageVO getTotalAccRedRechargePage(@Param("param") AccRedRechargePageDTO content);
+
+   List<AccRedCollectVO> listAccRedRechargeCollectPageForCustPsn(@Param("param") AccRedRechargeCollectDTO content);
+
+   @LeNiuDataPermission(
+           alias = "g",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccRedCollectVO> listAccRedRechargeCollectPageForCustOrg(@Param("param") AccRedRechargeCollectDTO content);
+
+   @LeNiuDataPermission(
+           alias = "ci",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccRedCollectVO> listAccRedRechargeCollectPageForCust(@Param("param") AccRedRechargeCollectDTO content);
+
+   @LeNiuDataPermission(
+           alias = "ci",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccRedCollectVO queryAccRedRechargeCollectPageSumForCust(@Param("param") AccRedRechargeCollectDTO content);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccRedCollectVO queryAccRedRechargeCollectPageSum(@Param("param") AccRedRechargeCollectDTO content);
+
+   @LeNiuDataPermission(
+           alias = "t1",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccRechargeDetailPageVO getTotalRechargeAmount(@Param("param") AccRechargeDetailPageDTO rechargeDetailPageDTO);
+
+   @LeNiuDataPermission(
+           alias = "t1",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccRechargeDetailPageVO> listAccRechargeDetails(@Param("param") AccRechargeDetailPageDTO rechargeDetailPageDTO);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccWalletRepealV4PageVO getWalletRepealAccTradePageTotal(@Param("param") AccTradeRepealPageDTO pageDTO);
+
+   @LeNiuDataPermission(
+           alias = "atr",
+           permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccWalletRepealV4PageVO> listWalletRepealAccTradeV4(@Param("param") AccTradeRepealPageDTO pageDTO);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccTradeRepealErrorMapper.java

@@ -0,0 +1,35 @@
+package com.bonus.canteen.core.account.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bonus.canteen.core.account.v3.model.AccTrade;
+import com.bonus.canteen.core.account.v3.model.AccTradeRepealError;
+import com.bonus.canteen.core.account.v3.web.dto.AccTradeRepealErrorPageDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccTradeRepealPageVO;
+import com.bonus.canteen.core.auth.config.LeNiuDataPermission;
+import com.bonus.canteen.core.auth.enums.DataPermissionTypeEnum;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface AccTradeRepealErrorMapper extends BaseMapper<AccTradeRepealError> {
+   @LeNiuDataPermission(
+      alias = "ci",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   Page<AccTradeRepealPageVO> queryAccTradeRepealError(Page<AccTrade> page, @Param("param") AccTradeRepealErrorPageDTO content);
+
+   @LeNiuDataPermission(
+      alias = "ci",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   List<AccTradeRepealPageVO> listAccTradeRepealError(@Param("param") AccTradeRepealErrorPageDTO content);
+
+   @LeNiuDataPermission(
+      alias = "ci",
+      permissionType = DataPermissionTypeEnum.PERMISSION_ORG
+   )
+   AccTradeRepealPageVO getTotalqueryAccTradeRepealError(@Param("param") AccTradeRepealErrorPageDTO content);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccTradeWalletDetailMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.bonus.canteen.core.account.v3.model.AccTradeWalletDetail;
 import com.bonus.canteen.core.account.v3.mq.send.model.RepAccMqDetailModel;
 import com.bonus.canteen.core.account.v3.po.AccOrdTradeDetailPO;
+import com.bonus.canteen.core.account.v3.web.vo.AccDrawWalletDetailVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -28,4 +29,8 @@ public interface AccTradeWalletDetailMapper extends BaseMapper<AccTradeWalletDet
    List<AccOrdTradeDetailPO> queryAccTradeOrderDetailByLeOrderNo(@Param("leOrderNo") Long leOrderNo, @Param("leOrderNoList") List<Long> leOrderNoList);
 
    List<AccTradeWalletDetail> queryAccTradeWalletDetailByTradeIdList(@Param("tradeIdList") List<Long> tradeIdList);
+
+   List<AccTradeWalletDetail> listAccSubsidyExpirationTrade(@Param("startDateTime") LocalDateTime startDateTime, @Param("endDateTime") LocalDateTime endDateTime);
+
+   List<AccDrawWalletDetailVO> queryAccTradeByOriginTradeId(@Param("tradeIdList") List<Long> originTradeIdList);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccWalletInfoMapper.java

@@ -22,4 +22,9 @@ public interface AccWalletInfoMapper extends BaseMapper<AccWalletInfo> {
 
    void updateAccWalletInfoForUnFrozen(@Param("custId") Long custId, @Param("walletId") Integer walletId, @Param("amount") BigDecimal amount, @Param("updateId") long updateId);
 
+   List<AccWalletInfoVO> queryAccWalletInfoVOMapByCustIdList(@Param("custIdList") List<Long> custIdList);
+
+   void updateLimitBalanceByCustId(@Param("limitBalance") BigDecimal limitBalance, @Param("walletId") Integer walletId, @Param("custId") Long custId, @Param("custIdList") List<Long> custIdList);
+
+   BigDecimal getAccWalletFrozenTotal(@Param("custId") Long custId);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/metadata/controller/AccMetadataController.java

@@ -1,6 +1,8 @@
 package com.bonus.canteen.core.account.v3.metadata.controller;
 
+import com.bonus.canteen.core.account.v3.metadata.dto.AccMetadataDTO;
 import com.bonus.canteen.core.account.v3.metadata.model.AccMetadataModel;
+import com.bonus.canteen.core.account.v3.metadata.model.AccSubMetadataModel;
 import com.bonus.canteen.core.account.v3.metadata.service.AccMetadataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -8,6 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -28,4 +31,22 @@ public class AccMetadataController {
    public AccMetadataModel queryMetadata() {
       return this.accMetadataService.queryMetadata();
    }
+
+   @ApiOperation("保存配置")
+   @PostMapping({"/save"})
+   public void saveMetadata(@RequestBody AccMetadataDTO request) {
+      this.accMetadataService.saveMetadata(request);
+   }
+
+   @ApiOperation("查询账户补贴配置")
+   @PostMapping({"/query/acc-sub"})
+   public AccSubMetadataModel queryAccSubMetadata() {
+      return this.accMetadataService.queryAccSubMetadata();
+   }
+
+   @ApiOperation("保存账户补贴配置")
+   @PostMapping({"/save/acc-sub"})
+   public void saveAccSubMetadata(@RequestBody AccSubMetadataModel request) {
+      this.accMetadataService.saveAccSubMetadata(request);
+   }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/metadata/dto/AccMetadataDTO.java

@@ -0,0 +1,19 @@
+package com.bonus.canteen.core.account.v3.metadata.dto;
+
+import com.bonus.canteen.core.account.v3.metadata.model.AccMetadataModel;
+import io.swagger.annotations.ApiModel;
+import lombok.Generated;
+
+@ApiModel("账户配置模型")
+public class AccMetadataDTO extends AccMetadataModel {
+   public AccMetadataDTO() {
+      super.setIfUseThirdRecharge("2");
+      super.setIfUseThirdAccBal("2");
+      super.setMinBalanceLimit("0");
+      super.setMinSubBalanceLimit("0");
+      super.setMinRedBalanceLimit("0");
+      super.setIfApproveMobileWithdraw("2");
+      super.setIfSupportMobileWithdraw("2");
+   }
+
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/metadata/model/AccSubMetadataModel.java

@@ -0,0 +1,34 @@
+package com.bonus.canteen.core.account.v3.metadata.model;
+
+import cn.hutool.core.text.CharSequenceUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel("账户补贴配置模型")
+public class AccSubMetadataModel {
+   @ApiModelProperty("补贴是否开启手动领取 1-是 2-否 默认否")
+   private String ifSubManualReceive;
+   @ApiModelProperty("补贴规则未领取是否失效 1-是 2-否 默认否")
+   private String ifSubRuleNoReceiveFailure;
+
+   public String getIfSubManualReceive() {
+      return CharSequenceUtil.isBlank(this.ifSubManualReceive) ? "2" : this.ifSubManualReceive;
+   }
+
+   public String getIfSubRuleNoReceiveFailure() {
+      return CharSequenceUtil.isBlank(this.ifSubRuleNoReceiveFailure) ? "2" : this.ifSubRuleNoReceiveFailure;
+   }
+
+   public void setIfSubManualReceive(final String ifSubManualReceive) {
+      this.ifSubManualReceive = ifSubManualReceive;
+   }
+
+   public void setIfSubRuleNoReceiveFailure(final String ifSubRuleNoReceiveFailure) {
+      this.ifSubRuleNoReceiveFailure = ifSubRuleNoReceiveFailure;
+   }
+
+   public String toString() {
+      String var10000 = this.getIfSubManualReceive();
+      return "AccSubMetadataModel(ifSubManualReceive=" + var10000 + ", ifSubRuleNoReceiveFailure=" + this.getIfSubRuleNoReceiveFailure() + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/metadata/service/AccMetadataService.java

@@ -1,6 +1,9 @@
 package com.bonus.canteen.core.account.v3.metadata.service;
 
+import com.bonus.canteen.core.account.v3.metadata.dto.AccMetadataDTO;
 import com.bonus.canteen.core.account.v3.metadata.model.AccMetadataModel;
+import com.bonus.canteen.core.account.v3.metadata.model.AccSubMetadataModel;
+import com.bonus.canteen.core.account.v3.service.AccDeductionConfService;
 import com.bonus.canteen.core.allocation.api.AllocMetadataApi;
 import com.bonus.canteen.core.common.enums.MetadataModelTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,8 +17,26 @@ public class AccMetadataService {
    @Resource
    @Lazy
    private AllocMetadataApi allocMetadataApi;
+   @Autowired
+   @Lazy
+   private AccDeductionConfService accDeductionConfService;
+
 
    public AccMetadataModel queryMetadata() {
       return (AccMetadataModel)this.allocMetadataApi.queryMetadataModel(MetadataModelTypeEnum.ACC, new AccMetadataModel());
    }
+
+   public void saveMetadata(AccMetadataDTO accMetadataDto) {
+      this.allocMetadataApi.saveMetadataModel(MetadataModelTypeEnum.ACC, accMetadataDto);
+      this.accDeductionConfService.updateAppletDeductionCache(accMetadataDto.getAccPayOrder());
+   }
+
+   public AccSubMetadataModel queryAccSubMetadata() {
+      return (AccSubMetadataModel)this.allocMetadataApi.queryMetadataModel(MetadataModelTypeEnum.ACC,
+              new AccSubMetadataModel());
+   }
+
+   public void saveAccSubMetadata(AccSubMetadataModel content) {
+      this.allocMetadataApi.saveMetadataModel(MetadataModelTypeEnum.ACC, content);
+   }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/model/AccDeductionConf.java

@@ -0,0 +1,162 @@
+package com.bonus.canteen.core.account.v3.model;
+
+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 java.io.Serializable;
+import java.util.Date;
+
+@TableName("acc_deduction_conf")
+public class AccDeductionConf implements Serializable {
+   @TableId(
+      type = IdType.AUTO
+   )
+   private Integer id;
+   private Integer useType;
+   private Integer walletId;
+   private String mchSn;
+   private Integer sort;
+   private String crby;
+   private Date crtime;
+   @TableField(
+      exist = false
+   )
+   private static final long serialVersionUID = 1L;
+
+   public static AccDeductionConfBuilder builder() {
+      return new AccDeductionConfBuilder();
+   }
+
+   public Integer getId() {
+      return this.id;
+   }
+
+   public Integer getUseType() {
+      return this.useType;
+   }
+
+   public Integer getWalletId() {
+      return this.walletId;
+   }
+
+   public String getMchSn() {
+      return this.mchSn;
+   }
+
+   public Integer getSort() {
+      return this.sort;
+   }
+
+   public String getCrby() {
+      return this.crby;
+   }
+
+   public Date getCrtime() {
+      return this.crtime;
+   }
+
+   public void setId(final Integer id) {
+      this.id = id;
+   }
+
+   public void setUseType(final Integer useType) {
+      this.useType = useType;
+   }
+
+   public void setWalletId(final Integer walletId) {
+      this.walletId = walletId;
+   }
+
+   public void setMchSn(final String mchSn) {
+      this.mchSn = mchSn;
+   }
+
+   public void setSort(final Integer sort) {
+      this.sort = sort;
+   }
+
+   public void setCrby(final String crby) {
+      this.crby = crby;
+   }
+
+   public void setCrtime(final Date crtime) {
+      this.crtime = crtime;
+   }
+
+   public String toString() {
+      Integer var10000 = this.getId();
+      return "AccDeductionConf(id=" + var10000 + ", useType=" + this.getUseType() + ", walletId=" + this.getWalletId() + ", mchSn=" + this.getMchSn() + ", sort=" + this.getSort() + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ")";
+   }
+
+   public AccDeductionConf(final Integer id, final Integer useType, final Integer walletId, final String mchSn, final Integer sort, final String crby, final Date crtime) {
+      this.id = id;
+      this.useType = useType;
+      this.walletId = walletId;
+      this.mchSn = mchSn;
+      this.sort = sort;
+      this.crby = crby;
+      this.crtime = crtime;
+   }
+
+   public AccDeductionConf() {
+   }
+
+   public static class AccDeductionConfBuilder {
+      private Integer id;
+      private Integer useType;
+      private Integer walletId;
+      private String mchSn;
+      private Integer sort;
+      private String crby;
+      private Date crtime;
+
+      AccDeductionConfBuilder() {
+      }
+
+      public AccDeductionConfBuilder id(final Integer id) {
+         this.id = id;
+         return this;
+      }
+
+      public AccDeductionConfBuilder useType(final Integer useType) {
+         this.useType = useType;
+         return this;
+      }
+
+      public AccDeductionConfBuilder walletId(final Integer walletId) {
+         this.walletId = walletId;
+         return this;
+      }
+
+      public AccDeductionConfBuilder mchSn(final String mchSn) {
+         this.mchSn = mchSn;
+         return this;
+      }
+
+      public AccDeductionConfBuilder sort(final Integer sort) {
+         this.sort = sort;
+         return this;
+      }
+
+      public AccDeductionConfBuilder crby(final String crby) {
+         this.crby = crby;
+         return this;
+      }
+
+      public AccDeductionConfBuilder crtime(final Date crtime) {
+         this.crtime = crtime;
+         return this;
+      }
+
+      public AccDeductionConf build() {
+         return new AccDeductionConf(this.id, this.useType, this.walletId, this.mchSn, this.sort, this.crby, this.crtime);
+      }
+
+      public String toString() {
+         Integer var10000 = this.id;
+         return "AccDeductionConf.AccDeductionConfBuilder(id=" + var10000 + ", useType=" + this.useType + ", walletId=" + this.walletId + ", mchSn=" + this.mchSn + ", sort=" + this.sort + ", crby=" + this.crby + ", crtime=" + String.valueOf(this.crtime) + ")";
+      }
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/model/AccDrawAudit.java

@@ -0,0 +1,438 @@
+package com.bonus.canteen.core.account.v3.model;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@TableName("acc_draw_audit")
+@ApiModel("账户取款审核记录表")
+public class AccDrawAudit implements Serializable {
+   @TableId(
+      type = IdType.AUTO
+   )
+   private Long id;
+   private Long auditId;
+   private Long custId;
+   private Integer applyAmount;
+   private String applyReason;
+   private Integer actualAmount;
+   private Integer cashAmount;
+   private Integer auditStatus;
+   private String content;
+   private LocalDateTime crtime;
+   @TableField(
+      value = "upby",
+      fill = FieldFill.UPDATE
+   )
+   private String upby;
+   private LocalDateTime uptime;
+   private BigDecimal accBalTotal;
+   private BigDecimal walletBal;
+   private BigDecimal subsidyBal;
+   private BigDecimal redBal;
+   private BigDecimal accFreezeBalTotal;
+   private String errorMsg;
+   private Long orgId;
+   private Integer psnType;
+   private Long flowInstanceId;
+   private String auditReason;
+   private Integer withDrawResult;
+   private LocalDateTime approvalTime;
+   @TableField(
+      exist = false
+   )
+   private static final long serialVersionUID = 1L;
+
+   public static AccDrawAuditBuilder builder() {
+      return new AccDrawAuditBuilder();
+   }
+
+   public Long getId() {
+      return this.id;
+   }
+
+   public Long getAuditId() {
+      return this.auditId;
+   }
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public Integer getApplyAmount() {
+      return this.applyAmount;
+   }
+
+   public String getApplyReason() {
+      return this.applyReason;
+   }
+
+   public Integer getActualAmount() {
+      return this.actualAmount;
+   }
+
+   public Integer getCashAmount() {
+      return this.cashAmount;
+   }
+
+   public Integer getAuditStatus() {
+      return this.auditStatus;
+   }
+
+   public String getContent() {
+      return this.content;
+   }
+
+   public LocalDateTime getCrtime() {
+      return this.crtime;
+   }
+
+   public String getUpby() {
+      return this.upby;
+   }
+
+   public LocalDateTime getUptime() {
+      return this.uptime;
+   }
+
+   public BigDecimal getAccBalTotal() {
+      return this.accBalTotal;
+   }
+
+   public BigDecimal getWalletBal() {
+      return this.walletBal;
+   }
+
+   public BigDecimal getSubsidyBal() {
+      return this.subsidyBal;
+   }
+
+   public BigDecimal getRedBal() {
+      return this.redBal;
+   }
+
+   public BigDecimal getAccFreezeBalTotal() {
+      return this.accFreezeBalTotal;
+   }
+
+   public String getErrorMsg() {
+      return this.errorMsg;
+   }
+
+   public Long getOrgId() {
+      return this.orgId;
+   }
+
+   public Integer getPsnType() {
+      return this.psnType;
+   }
+
+   public Long getFlowInstanceId() {
+      return this.flowInstanceId;
+   }
+
+   public String getAuditReason() {
+      return this.auditReason;
+   }
+
+   public Integer getWithDrawResult() {
+      return this.withDrawResult;
+   }
+
+   public LocalDateTime getApprovalTime() {
+      return this.approvalTime;
+   }
+
+   public void setId(final Long id) {
+      this.id = id;
+   }
+
+   public void setAuditId(final Long auditId) {
+      this.auditId = auditId;
+   }
+
+   public void setCustId(final Long custId) {
+      this.custId = custId;
+   }
+
+   public void setApplyAmount(final Integer applyAmount) {
+      this.applyAmount = applyAmount;
+   }
+
+   public void setApplyReason(final String applyReason) {
+      this.applyReason = applyReason;
+   }
+
+   public void setActualAmount(final Integer actualAmount) {
+      this.actualAmount = actualAmount;
+   }
+
+   public void setCashAmount(final Integer cashAmount) {
+      this.cashAmount = cashAmount;
+   }
+
+   public void setAuditStatus(final Integer auditStatus) {
+      this.auditStatus = auditStatus;
+   }
+
+   public void setContent(final String content) {
+      this.content = content;
+   }
+
+   public void setCrtime(final LocalDateTime crtime) {
+      this.crtime = crtime;
+   }
+
+   public void setUpby(final String upby) {
+      this.upby = upby;
+   }
+
+   public void setUptime(final LocalDateTime uptime) {
+      this.uptime = uptime;
+   }
+
+   public void setAccBalTotal(final BigDecimal accBalTotal) {
+      this.accBalTotal = accBalTotal;
+   }
+
+   public void setWalletBal(final BigDecimal walletBal) {
+      this.walletBal = walletBal;
+   }
+
+   public void setSubsidyBal(final BigDecimal subsidyBal) {
+      this.subsidyBal = subsidyBal;
+   }
+
+   public void setRedBal(final BigDecimal redBal) {
+      this.redBal = redBal;
+   }
+
+   public void setAccFreezeBalTotal(final BigDecimal accFreezeBalTotal) {
+      this.accFreezeBalTotal = accFreezeBalTotal;
+   }
+
+   public void setErrorMsg(final String errorMsg) {
+      this.errorMsg = errorMsg;
+   }
+
+   public void setOrgId(final Long orgId) {
+      this.orgId = orgId;
+   }
+
+   public void setPsnType(final Integer psnType) {
+      this.psnType = psnType;
+   }
+
+   public void setFlowInstanceId(final Long flowInstanceId) {
+      this.flowInstanceId = flowInstanceId;
+   }
+
+   public void setAuditReason(final String auditReason) {
+      this.auditReason = auditReason;
+   }
+
+   public void setWithDrawResult(final Integer withDrawResult) {
+      this.withDrawResult = withDrawResult;
+   }
+
+   public void setApprovalTime(final LocalDateTime approvalTime) {
+      this.approvalTime = approvalTime;
+   }
+
+   public String toString() {
+      Long var10000 = this.getId();
+      return "AccDrawAudit(id=" + var10000 + ", auditId=" + this.getAuditId() + ", custId=" + this.getCustId() + ", applyAmount=" + this.getApplyAmount() + ", applyReason=" + this.getApplyReason() + ", actualAmount=" + this.getActualAmount() + ", cashAmount=" + this.getCashAmount() + ", auditStatus=" + this.getAuditStatus() + ", content=" + this.getContent() + ", crtime=" + String.valueOf(this.getCrtime()) + ", upby=" + this.getUpby() + ", uptime=" + String.valueOf(this.getUptime()) + ", accBalTotal=" + String.valueOf(this.getAccBalTotal()) + ", walletBal=" + String.valueOf(this.getWalletBal()) + ", subsidyBal=" + String.valueOf(this.getSubsidyBal()) + ", redBal=" + String.valueOf(this.getRedBal()) + ", accFreezeBalTotal=" + String.valueOf(this.getAccFreezeBalTotal()) + ", errorMsg=" + this.getErrorMsg() + ", orgId=" + this.getOrgId() + ", psnType=" + this.getPsnType() + ", flowInstanceId=" + this.getFlowInstanceId() + ", auditReason=" + this.getAuditReason() + ", withDrawResult=" + this.getWithDrawResult() + ", approvalTime=" + String.valueOf(this.getApprovalTime()) + ")";
+   }
+
+   public AccDrawAudit() {
+   }
+
+   public AccDrawAudit(final Long id, final Long auditId, final Long custId, final Integer applyAmount, final String applyReason, final Integer actualAmount, final Integer cashAmount, final Integer auditStatus, final String content, final LocalDateTime crtime, final String upby, final LocalDateTime uptime, final BigDecimal accBalTotal, final BigDecimal walletBal, final BigDecimal subsidyBal, final BigDecimal redBal, final BigDecimal accFreezeBalTotal, final String errorMsg, final Long orgId, final Integer psnType, final Long flowInstanceId, final String auditReason, final Integer withDrawResult, final LocalDateTime approvalTime) {
+      this.id = id;
+      this.auditId = auditId;
+      this.custId = custId;
+      this.applyAmount = applyAmount;
+      this.applyReason = applyReason;
+      this.actualAmount = actualAmount;
+      this.cashAmount = cashAmount;
+      this.auditStatus = auditStatus;
+      this.content = content;
+      this.crtime = crtime;
+      this.upby = upby;
+      this.uptime = uptime;
+      this.accBalTotal = accBalTotal;
+      this.walletBal = walletBal;
+      this.subsidyBal = subsidyBal;
+      this.redBal = redBal;
+      this.accFreezeBalTotal = accFreezeBalTotal;
+      this.errorMsg = errorMsg;
+      this.orgId = orgId;
+      this.psnType = psnType;
+      this.flowInstanceId = flowInstanceId;
+      this.auditReason = auditReason;
+      this.withDrawResult = withDrawResult;
+      this.approvalTime = approvalTime;
+   }
+
+   public static class AccDrawAuditBuilder {
+      private Long id;
+      private Long auditId;
+      private Long custId;
+      private Integer applyAmount;
+      private String applyReason;
+      private Integer actualAmount;
+      private Integer cashAmount;
+      private Integer auditStatus;
+      private String content;
+      private LocalDateTime crtime;
+      private String upby;
+      private LocalDateTime uptime;
+      private BigDecimal accBalTotal;
+      private BigDecimal walletBal;
+      private BigDecimal subsidyBal;
+      private BigDecimal redBal;
+      private BigDecimal accFreezeBalTotal;
+      private String errorMsg;
+      private Long orgId;
+      private Integer psnType;
+      private Long flowInstanceId;
+      private String auditReason;
+      private Integer withDrawResult;
+      private LocalDateTime approvalTime;
+
+      AccDrawAuditBuilder() {
+      }
+
+      public AccDrawAuditBuilder id(final Long id) {
+         this.id = id;
+         return this;
+      }
+
+      public AccDrawAuditBuilder auditId(final Long auditId) {
+         this.auditId = auditId;
+         return this;
+      }
+
+      public AccDrawAuditBuilder custId(final Long custId) {
+         this.custId = custId;
+         return this;
+      }
+
+      public AccDrawAuditBuilder applyAmount(final Integer applyAmount) {
+         this.applyAmount = applyAmount;
+         return this;
+      }
+
+      public AccDrawAuditBuilder applyReason(final String applyReason) {
+         this.applyReason = applyReason;
+         return this;
+      }
+
+      public AccDrawAuditBuilder actualAmount(final Integer actualAmount) {
+         this.actualAmount = actualAmount;
+         return this;
+      }
+
+      public AccDrawAuditBuilder cashAmount(final Integer cashAmount) {
+         this.cashAmount = cashAmount;
+         return this;
+      }
+
+      public AccDrawAuditBuilder auditStatus(final Integer auditStatus) {
+         this.auditStatus = auditStatus;
+         return this;
+      }
+
+      public AccDrawAuditBuilder content(final String content) {
+         this.content = content;
+         return this;
+      }
+
+      public AccDrawAuditBuilder crtime(final LocalDateTime crtime) {
+         this.crtime = crtime;
+         return this;
+      }
+
+      public AccDrawAuditBuilder upby(final String upby) {
+         this.upby = upby;
+         return this;
+      }
+
+      public AccDrawAuditBuilder uptime(final LocalDateTime uptime) {
+         this.uptime = uptime;
+         return this;
+      }
+
+      public AccDrawAuditBuilder accBalTotal(final BigDecimal accBalTotal) {
+         this.accBalTotal = accBalTotal;
+         return this;
+      }
+
+      public AccDrawAuditBuilder walletBal(final BigDecimal walletBal) {
+         this.walletBal = walletBal;
+         return this;
+      }
+
+      public AccDrawAuditBuilder subsidyBal(final BigDecimal subsidyBal) {
+         this.subsidyBal = subsidyBal;
+         return this;
+      }
+
+      public AccDrawAuditBuilder redBal(final BigDecimal redBal) {
+         this.redBal = redBal;
+         return this;
+      }
+
+      public AccDrawAuditBuilder accFreezeBalTotal(final BigDecimal accFreezeBalTotal) {
+         this.accFreezeBalTotal = accFreezeBalTotal;
+         return this;
+      }
+
+      public AccDrawAuditBuilder errorMsg(final String errorMsg) {
+         this.errorMsg = errorMsg;
+         return this;
+      }
+
+      public AccDrawAuditBuilder orgId(final Long orgId) {
+         this.orgId = orgId;
+         return this;
+      }
+
+      public AccDrawAuditBuilder psnType(final Integer psnType) {
+         this.psnType = psnType;
+         return this;
+      }
+
+      public AccDrawAuditBuilder flowInstanceId(final Long flowInstanceId) {
+         this.flowInstanceId = flowInstanceId;
+         return this;
+      }
+
+      public AccDrawAuditBuilder auditReason(final String auditReason) {
+         this.auditReason = auditReason;
+         return this;
+      }
+
+      public AccDrawAuditBuilder withDrawResult(final Integer withDrawResult) {
+         this.withDrawResult = withDrawResult;
+         return this;
+      }
+
+      public AccDrawAuditBuilder approvalTime(final LocalDateTime approvalTime) {
+         this.approvalTime = approvalTime;
+         return this;
+      }
+
+      public AccDrawAudit build() {
+         return new AccDrawAudit(this.id, this.auditId, this.custId, this.applyAmount, this.applyReason, this.actualAmount, this.cashAmount, this.auditStatus, this.content, this.crtime, this.upby, this.uptime, this.accBalTotal, this.walletBal, this.subsidyBal, this.redBal, this.accFreezeBalTotal, this.errorMsg, this.orgId, this.psnType, this.flowInstanceId, this.auditReason, this.withDrawResult, this.approvalTime);
+      }
+
+      public String toString() {
+         Long var10000 = this.id;
+         return "AccDrawAudit.AccDrawAuditBuilder(id=" + var10000 + ", auditId=" + this.auditId + ", custId=" + this.custId + ", applyAmount=" + this.applyAmount + ", applyReason=" + this.applyReason + ", actualAmount=" + this.actualAmount + ", cashAmount=" + this.cashAmount + ", auditStatus=" + this.auditStatus + ", content=" + this.content + ", crtime=" + String.valueOf(this.crtime) + ", upby=" + this.upby + ", uptime=" + String.valueOf(this.uptime) + ", accBalTotal=" + String.valueOf(this.accBalTotal) + ", walletBal=" + String.valueOf(this.walletBal) + ", subsidyBal=" + String.valueOf(this.subsidyBal) + ", redBal=" + String.valueOf(this.redBal) + ", accFreezeBalTotal=" + String.valueOf(this.accFreezeBalTotal) + ", errorMsg=" + this.errorMsg + ", orgId=" + this.orgId + ", psnType=" + this.psnType + ", flowInstanceId=" + this.flowInstanceId + ", auditReason=" + this.auditReason + ", withDrawResult=" + this.withDrawResult + ", approvalTime=" + String.valueOf(this.approvalTime) + ")";
+      }
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/model/AccOperationRecord.java

@@ -0,0 +1,179 @@
+package com.bonus.canteen.core.account.v3.model;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.bonus.canteen.core.account.v3.utils.AccUtils;
+import com.bonus.canteen.core.customer.model.CustInfo;
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@TableName("acc_operation_record")
+@ApiModel("账户操作记录表")
+public class AccOperationRecord implements Serializable {
+   private static final long serialVersionUID = 1L;
+   @TableId
+   private Integer id;
+   private Long custId;
+   private String custNum;
+   private String custName;
+   private String mobile;
+   private Integer type;
+   private String crby;
+   private LocalDateTime crtime;
+
+   public static AccOperationRecord builderByCustInfo(CustInfo custInfo, Integer type) {
+      return builder().custId(custInfo.getCustId()).custNum(custInfo.getCustNum()).custName(custInfo.getCustName()).mobile(custInfo.getMobile()).type(type).crby(AccUtils.getOperatorName()).build();
+   }
+
+   public static AccOperationRecordBuilder builder() {
+      return new AccOperationRecordBuilder();
+   }
+
+   public AccOperationRecord(final Integer id, final Long custId, final String custNum, final String custName, final String mobile, final Integer type, final String crby, final LocalDateTime crtime) {
+      this.id = id;
+      this.custId = custId;
+      this.custNum = custNum;
+      this.custName = custName;
+      this.mobile = mobile;
+      this.type = type;
+      this.crby = crby;
+      this.crtime = crtime;
+   }
+
+   public AccOperationRecord() {
+   }
+
+   public Integer getId() {
+      return this.id;
+   }
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public String getCustNum() {
+      return this.custNum;
+   }
+
+   public String getCustName() {
+      return this.custName;
+   }
+
+   public String getMobile() {
+      return this.mobile;
+   }
+
+   public Integer getType() {
+      return this.type;
+   }
+
+   public String getCrby() {
+      return this.crby;
+   }
+
+   public LocalDateTime getCrtime() {
+      return this.crtime;
+   }
+
+   public void setId(final Integer id) {
+      this.id = id;
+   }
+
+   public void setCustId(final Long custId) {
+      this.custId = custId;
+   }
+
+   public void setCustNum(final String custNum) {
+      this.custNum = custNum;
+   }
+
+   public void setCustName(final String custName) {
+      this.custName = custName;
+   }
+
+   public void setMobile(final String mobile) {
+      this.mobile = mobile;
+   }
+
+   public void setType(final Integer type) {
+      this.type = type;
+   }
+
+   public void setCrby(final String crby) {
+      this.crby = crby;
+   }
+
+   public void setCrtime(final LocalDateTime crtime) {
+      this.crtime = crtime;
+   }
+
+   public String toString() {
+      Integer var10000 = this.getId();
+      return "AccOperationRecord(id=" + var10000 + ", custId=" + this.getCustId() + ", custNum=" + this.getCustNum() + ", custName=" + this.getCustName() + ", mobile=" + this.getMobile() + ", type=" + this.getType() + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ")";
+   }
+
+   public static class AccOperationRecordBuilder {
+      private Integer id;
+      private Long custId;
+      private String custNum;
+      private String custName;
+      private String mobile;
+      private Integer type;
+      private String crby;
+      private LocalDateTime crtime;
+
+      AccOperationRecordBuilder() {
+      }
+
+      public AccOperationRecordBuilder id(final Integer id) {
+         this.id = id;
+         return this;
+      }
+
+      public AccOperationRecordBuilder custId(final Long custId) {
+         this.custId = custId;
+         return this;
+      }
+
+      public AccOperationRecordBuilder custNum(final String custNum) {
+         this.custNum = custNum;
+         return this;
+      }
+
+      public AccOperationRecordBuilder custName(final String custName) {
+         this.custName = custName;
+         return this;
+      }
+
+      public AccOperationRecordBuilder mobile(final String mobile) {
+         this.mobile = mobile;
+         return this;
+      }
+
+      public AccOperationRecordBuilder type(final Integer type) {
+         this.type = type;
+         return this;
+      }
+
+      public AccOperationRecordBuilder crby(final String crby) {
+         this.crby = crby;
+         return this;
+      }
+
+      public AccOperationRecordBuilder crtime(final LocalDateTime crtime) {
+         this.crtime = crtime;
+         return this;
+      }
+
+      public AccOperationRecord build() {
+         return new AccOperationRecord(this.id, this.custId, this.custNum, this.custName, this.mobile, this.type, this.crby, this.crtime);
+      }
+
+      public String toString() {
+         Integer var10000 = this.id;
+         return "AccOperationRecord.AccOperationRecordBuilder(id=" + var10000 + ", custId=" + this.custId + ", custNum=" + this.custNum + ", custName=" + this.custName + ", mobile=" + this.mobile + ", type=" + this.type + ", crby=" + this.crby + ", crtime=" + String.valueOf(this.crtime) + ")";
+      }
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/model/AccRepairError.java

@@ -0,0 +1,90 @@
+package com.bonus.canteen.core.account.v3.model;
+
+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 java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@TableName("acc_repair_error")
+public class AccRepairError implements Serializable {
+   @TableField(
+      exist = false
+   )
+   private static final long serialVersionUID = 1L;
+   @TableId(
+      type = IdType.AUTO
+   )
+   private Long id;
+   private Long custId;
+   private BigDecimal amount;
+   private String errorMsg;
+   private LocalDate deductDate;
+   private String crby;
+   private LocalDateTime crtime;
+
+   public Long getId() {
+      return this.id;
+   }
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public BigDecimal getAmount() {
+      return this.amount;
+   }
+
+   public String getErrorMsg() {
+      return this.errorMsg;
+   }
+
+   public LocalDate getDeductDate() {
+      return this.deductDate;
+   }
+
+   public String getCrby() {
+      return this.crby;
+   }
+
+   public LocalDateTime getCrtime() {
+      return this.crtime;
+   }
+
+   public void setId(final Long id) {
+      this.id = id;
+   }
+
+   public void setCustId(final Long custId) {
+      this.custId = custId;
+   }
+
+   public void setAmount(final BigDecimal amount) {
+      this.amount = amount;
+   }
+
+   public void setErrorMsg(final String errorMsg) {
+      this.errorMsg = errorMsg;
+   }
+
+   public void setDeductDate(final LocalDate deductDate) {
+      this.deductDate = deductDate;
+   }
+
+   public void setCrby(final String crby) {
+      this.crby = crby;
+   }
+
+   public void setCrtime(final LocalDateTime crtime) {
+      this.crtime = crtime;
+   }
+
+   public String toString() {
+      Long var10000 = this.getId();
+      return "AccRepairError(id=" + var10000 + ", custId=" + this.getCustId() + ", amount=" + String.valueOf(this.getAmount()) + ", errorMsg=" + this.getErrorMsg() + ", deductDate=" + String.valueOf(this.getDeductDate()) + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/model/AccSubHandReceive.java

@@ -0,0 +1,137 @@
+package com.bonus.canteen.core.account.v3.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@TableName("acc_sub_hand_receive")
+@ApiModel("补贴手动领取记录")
+public class AccSubHandReceive implements Serializable {
+   private static final long serialVersionUID = 1L;
+   private Long id;
+   private Long custId;
+   private BigDecimal amount;
+   private Integer receiveState;
+   private LocalDate receiveEndDate;
+   private Integer receiveClearFlag;
+   private Long timeRuleId;
+   private String crby;
+   private LocalDateTime crtime;
+   private String upby;
+   private LocalDateTime uptime;
+   private String remark;
+   private Integer validateDay;
+
+   public Long getId() {
+      return this.id;
+   }
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public BigDecimal getAmount() {
+      return this.amount;
+   }
+
+   public Integer getReceiveState() {
+      return this.receiveState;
+   }
+
+   public LocalDate getReceiveEndDate() {
+      return this.receiveEndDate;
+   }
+
+   public Integer getReceiveClearFlag() {
+      return this.receiveClearFlag;
+   }
+
+   public Long getTimeRuleId() {
+      return this.timeRuleId;
+   }
+
+   public String getCrby() {
+      return this.crby;
+   }
+
+   public LocalDateTime getCrtime() {
+      return this.crtime;
+   }
+
+   public String getUpby() {
+      return this.upby;
+   }
+
+   public LocalDateTime getUptime() {
+      return this.uptime;
+   }
+
+   public String getRemark() {
+      return this.remark;
+   }
+
+   public Integer getValidateDay() {
+      return this.validateDay;
+   }
+
+   public void setId(final Long id) {
+      this.id = id;
+   }
+
+   public void setCustId(final Long custId) {
+      this.custId = custId;
+   }
+
+   public void setAmount(final BigDecimal amount) {
+      this.amount = amount;
+   }
+
+   public void setReceiveState(final Integer receiveState) {
+      this.receiveState = receiveState;
+   }
+
+   public void setReceiveEndDate(final LocalDate receiveEndDate) {
+      this.receiveEndDate = receiveEndDate;
+   }
+
+   public void setReceiveClearFlag(final Integer receiveClearFlag) {
+      this.receiveClearFlag = receiveClearFlag;
+   }
+
+   public void setTimeRuleId(final Long timeRuleId) {
+      this.timeRuleId = timeRuleId;
+   }
+
+   public void setCrby(final String crby) {
+      this.crby = crby;
+   }
+
+   public void setCrtime(final LocalDateTime crtime) {
+      this.crtime = crtime;
+   }
+
+   public void setUpby(final String upby) {
+      this.upby = upby;
+   }
+
+   public void setUptime(final LocalDateTime uptime) {
+      this.uptime = uptime;
+   }
+
+   public void setRemark(final String remark) {
+      this.remark = remark;
+   }
+
+   public void setValidateDay(final Integer validateDay) {
+      this.validateDay = validateDay;
+   }
+
+   public String toString() {
+      Long var10000 = this.getId();
+      return "AccSubHandReceive(id=" + var10000 + ", custId=" + this.getCustId() + ", amount=" + String.valueOf(this.getAmount()) + ", receiveState=" + this.getReceiveState() + ", receiveEndDate=" + String.valueOf(this.getReceiveEndDate()) + ", receiveClearFlag=" + this.getReceiveClearFlag() + ", timeRuleId=" + this.getTimeRuleId() + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ", upby=" + this.getUpby() + ", uptime=" + String.valueOf(this.getUptime()) + ", remark=" + this.getRemark() + ", validateDay=" + this.getValidateDay() + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/model/AccSubTime.java

@@ -0,0 +1,190 @@
+package com.bonus.canteen.core.account.v3.model;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@TableName("acc_sub_time")
+@ApiModel("补贴定时规则")
+public class AccSubTime {
+   @TableId(
+      type = IdType.AUTO
+   )
+   private Long id;
+   private Long timeId;
+   private String timeName;
+   private String timeStart;
+   private Integer advance;
+   private Integer induction;
+   private BigDecimal amount;
+   private Integer state;
+   private Integer clearSub;
+   private String crby;
+   @TableField(
+      value = "crtime",
+      fill = FieldFill.INSERT
+   )
+   private LocalDateTime crtime;
+   private String upby;
+   @TableField(
+      value = "uptime",
+      fill = FieldFill.UPDATE
+   )
+   private LocalDateTime uptime;
+   private Integer sendType;
+   private String specifyReleaseDateList;
+   private Integer arrivalType;
+   private Integer unclaimedLapse;
+   private Integer validateDay;
+
+   public Long getId() {
+      return this.id;
+   }
+
+   public Long getTimeId() {
+      return this.timeId;
+   }
+
+   public String getTimeName() {
+      return this.timeName;
+   }
+
+   public String getTimeStart() {
+      return this.timeStart;
+   }
+
+   public Integer getAdvance() {
+      return this.advance;
+   }
+
+   public Integer getInduction() {
+      return this.induction;
+   }
+
+   public BigDecimal getAmount() {
+      return this.amount;
+   }
+
+   public Integer getState() {
+      return this.state;
+   }
+
+   public Integer getClearSub() {
+      return this.clearSub;
+   }
+
+   public String getCrby() {
+      return this.crby;
+   }
+
+   public LocalDateTime getCrtime() {
+      return this.crtime;
+   }
+
+   public String getUpby() {
+      return this.upby;
+   }
+
+   public LocalDateTime getUptime() {
+      return this.uptime;
+   }
+
+   public Integer getSendType() {
+      return this.sendType;
+   }
+
+   public String getSpecifyReleaseDateList() {
+      return this.specifyReleaseDateList;
+   }
+
+   public Integer getArrivalType() {
+      return this.arrivalType;
+   }
+
+   public Integer getUnclaimedLapse() {
+      return this.unclaimedLapse;
+   }
+
+   public Integer getValidateDay() {
+      return this.validateDay;
+   }
+
+   public void setId(final Long id) {
+      this.id = id;
+   }
+
+   public void setTimeId(final Long timeId) {
+      this.timeId = timeId;
+   }
+
+   public void setTimeName(final String timeName) {
+      this.timeName = timeName;
+   }
+
+   public void setTimeStart(final String timeStart) {
+      this.timeStart = timeStart;
+   }
+
+   public void setAdvance(final Integer advance) {
+      this.advance = advance;
+   }
+
+   public void setInduction(final Integer induction) {
+      this.induction = induction;
+   }
+
+   public void setAmount(final BigDecimal amount) {
+      this.amount = amount;
+   }
+
+   public void setState(final Integer state) {
+      this.state = state;
+   }
+
+   public void setClearSub(final Integer clearSub) {
+      this.clearSub = clearSub;
+   }
+
+   public void setCrby(final String crby) {
+      this.crby = crby;
+   }
+
+   public void setCrtime(final LocalDateTime crtime) {
+      this.crtime = crtime;
+   }
+
+   public void setUpby(final String upby) {
+      this.upby = upby;
+   }
+
+   public void setUptime(final LocalDateTime uptime) {
+      this.uptime = uptime;
+   }
+
+   public void setSendType(final Integer sendType) {
+      this.sendType = sendType;
+   }
+
+   public void setSpecifyReleaseDateList(final String specifyReleaseDateList) {
+      this.specifyReleaseDateList = specifyReleaseDateList;
+   }
+
+   public void setArrivalType(final Integer arrivalType) {
+      this.arrivalType = arrivalType;
+   }
+
+   public void setUnclaimedLapse(final Integer unclaimedLapse) {
+      this.unclaimedLapse = unclaimedLapse;
+   }
+
+   public void setValidateDay(final Integer validateDay) {
+      this.validateDay = validateDay;
+   }
+
+   public String toString() {
+      Long var10000 = this.getId();
+      return "AccSubTime(id=" + var10000 + ", timeId=" + this.getTimeId() + ", timeName=" + this.getTimeName() + ", timeStart=" + this.getTimeStart() + ", advance=" + this.getAdvance() + ", induction=" + this.getInduction() + ", amount=" + String.valueOf(this.getAmount()) + ", state=" + this.getState() + ", clearSub=" + this.getClearSub() + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ", upby=" + this.getUpby() + ", uptime=" + String.valueOf(this.getUptime()) + ", sendType=" + this.getSendType() + ", specifyReleaseDateList=" + this.getSpecifyReleaseDateList() + ", arrivalType=" + this.getArrivalType() + ", unclaimedLapse=" + this.getUnclaimedLapse() + ", validateDay=" + this.getValidateDay() + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/model/AccSubTimeRange.java

@@ -0,0 +1,127 @@
+package com.bonus.canteen.core.account.v3.model;
+
+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 io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+
+@TableName("acc_sub_time_range")
+@ApiModel("补贴定时规则适用范围")
+public class AccSubTimeRange implements Serializable {
+   @TableId(
+      type = IdType.AUTO
+   )
+   private Long id;
+   private Long timeId;
+   private Integer psnType;
+   private Long orgId;
+   private Integer type;
+   @TableField(
+      exist = false
+   )
+   private static final long serialVersionUID = 1L;
+
+   AccSubTimeRange(final Long id, final Long timeId, final Integer psnType, final Long orgId, final Integer type) {
+      this.id = id;
+      this.timeId = timeId;
+      this.psnType = psnType;
+      this.orgId = orgId;
+      this.type = type;
+   }
+
+   public static AccSubTimeRangeBuilder builder() {
+      return new AccSubTimeRangeBuilder();
+   }
+
+   public Long getId() {
+      return this.id;
+   }
+
+   public Long getTimeId() {
+      return this.timeId;
+   }
+
+   public Integer getPsnType() {
+      return this.psnType;
+   }
+
+   public Long getOrgId() {
+      return this.orgId;
+   }
+
+   public Integer getType() {
+      return this.type;
+   }
+
+   public void setId(final Long id) {
+      this.id = id;
+   }
+
+   public void setTimeId(final Long timeId) {
+      this.timeId = timeId;
+   }
+
+   public void setPsnType(final Integer psnType) {
+      this.psnType = psnType;
+   }
+
+   public void setOrgId(final Long orgId) {
+      this.orgId = orgId;
+   }
+
+   public void setType(final Integer type) {
+      this.type = type;
+   }
+
+   public String toString() {
+      Long var10000 = this.getId();
+      return "AccSubTimeRange(id=" + var10000 + ", timeId=" + this.getTimeId() + ", psnType=" + this.getPsnType() + ", orgId=" + this.getOrgId() + ", type=" + this.getType() + ")";
+   }
+
+   public static class AccSubTimeRangeBuilder {
+      private Long id;
+      private Long timeId;
+      private Integer psnType;
+      private Long orgId;
+      private Integer type;
+
+      AccSubTimeRangeBuilder() {
+      }
+
+      public AccSubTimeRangeBuilder id(final Long id) {
+         this.id = id;
+         return this;
+      }
+
+      public AccSubTimeRangeBuilder timeId(final Long timeId) {
+         this.timeId = timeId;
+         return this;
+      }
+
+      public AccSubTimeRangeBuilder psnType(final Integer psnType) {
+         this.psnType = psnType;
+         return this;
+      }
+
+      public AccSubTimeRangeBuilder orgId(final Long orgId) {
+         this.orgId = orgId;
+         return this;
+      }
+
+      public AccSubTimeRangeBuilder type(final Integer type) {
+         this.type = type;
+         return this;
+      }
+
+      public AccSubTimeRange build() {
+         return new AccSubTimeRange(this.id, this.timeId, this.psnType, this.orgId, this.type);
+      }
+
+      public String toString() {
+         return "AccSubTimeRange.AccSubTimeRangeBuilder(id=" + this.id + ", timeId=" + this.timeId + ", psnType=" + this.psnType + ", orgId=" + this.orgId + ", type=" + this.type + ")";
+      }
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/model/AccSubTimeReceiveHist.java

@@ -0,0 +1,142 @@
+package com.bonus.canteen.core.account.v3.model;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@TableName("acc_sub_time_receive_hist")
+public class AccSubTimeReceiveHist implements Serializable {
+   @TableField(
+      exist = false
+   )
+   private static final long serialVersionUID = 1L;
+   @TableId(
+      type = IdType.AUTO
+   )
+   private Integer id;
+   private Long custId;
+   private Long timeId;
+   private LocalDate subDate;
+   private BigDecimal subAmount;
+   private Integer isReceive;
+   private String subName;
+   private Integer clearSub;
+   private String remark;
+   @TableField(
+      value = "crtime",
+      fill = FieldFill.INSERT
+   )
+   private LocalDateTime crtime;
+   @TableField(
+      value = "uptime",
+      fill = FieldFill.UPDATE
+   )
+   private LocalDateTime uptime;
+
+   public Integer getId() {
+      return this.id;
+   }
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public Long getTimeId() {
+      return this.timeId;
+   }
+
+   public LocalDate getSubDate() {
+      return this.subDate;
+   }
+
+   public BigDecimal getSubAmount() {
+      return this.subAmount;
+   }
+
+   public Integer getIsReceive() {
+      return this.isReceive;
+   }
+
+   public String getSubName() {
+      return this.subName;
+   }
+
+   public Integer getClearSub() {
+      return this.clearSub;
+   }
+
+   public String getRemark() {
+      return this.remark;
+   }
+
+   public LocalDateTime getCrtime() {
+      return this.crtime;
+   }
+
+   public LocalDateTime getUptime() {
+      return this.uptime;
+   }
+
+   public AccSubTimeReceiveHist setId(final Integer id) {
+      this.id = id;
+      return this;
+   }
+
+   public AccSubTimeReceiveHist setCustId(final Long custId) {
+      this.custId = custId;
+      return this;
+   }
+
+   public AccSubTimeReceiveHist setTimeId(final Long timeId) {
+      this.timeId = timeId;
+      return this;
+   }
+
+   public AccSubTimeReceiveHist setSubDate(final LocalDate subDate) {
+      this.subDate = subDate;
+      return this;
+   }
+
+   public AccSubTimeReceiveHist setSubAmount(final BigDecimal subAmount) {
+      this.subAmount = subAmount;
+      return this;
+   }
+
+   public AccSubTimeReceiveHist setIsReceive(final Integer isReceive) {
+      this.isReceive = isReceive;
+      return this;
+   }
+
+   public AccSubTimeReceiveHist setSubName(final String subName) {
+      this.subName = subName;
+      return this;
+   }
+
+   public AccSubTimeReceiveHist setClearSub(final Integer clearSub) {
+      this.clearSub = clearSub;
+      return this;
+   }
+
+   public AccSubTimeReceiveHist setRemark(final String remark) {
+      this.remark = remark;
+      return this;
+   }
+
+   public AccSubTimeReceiveHist setCrtime(final LocalDateTime crtime) {
+      this.crtime = crtime;
+      return this;
+   }
+
+   public AccSubTimeReceiveHist setUptime(final LocalDateTime uptime) {
+      this.uptime = uptime;
+      return this;
+   }
+
+   public String toString() {
+      Integer var10000 = this.getId();
+      return "AccSubTimeReceiveHist(id=" + var10000 + ", custId=" + this.getCustId() + ", timeId=" + this.getTimeId() + ", subDate=" + String.valueOf(this.getSubDate()) + ", subAmount=" + String.valueOf(this.getSubAmount()) + ", isReceive=" + this.getIsReceive() + ", subName=" + this.getSubName() + ", clearSub=" + this.getClearSub() + ", remark=" + this.getRemark() + ", crtime=" + String.valueOf(this.getCrtime()) + ", uptime=" + String.valueOf(this.getUptime()) + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/model/AccTradeCashError.java

@@ -0,0 +1,120 @@
+package com.bonus.canteen.core.account.v3.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@TableName("acc_trade_cash_error")
+public class AccTradeCashError {
+   @TableId(
+      type = IdType.AUTO
+   )
+   private Long id;
+   private Long custId;
+   private BigDecimal amount;
+   private String errorMsg;
+   private String deviceSn;
+   private String deviceName;
+   private String deviceNum;
+   private String macOrderId;
+   private LocalDateTime rechargeTime;
+   private String crby;
+   private LocalDateTime crtime;
+
+   public Long getId() {
+      return this.id;
+   }
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public BigDecimal getAmount() {
+      return this.amount;
+   }
+
+   public String getErrorMsg() {
+      return this.errorMsg;
+   }
+
+   public String getDeviceSn() {
+      return this.deviceSn;
+   }
+
+   public String getDeviceName() {
+      return this.deviceName;
+   }
+
+   public String getDeviceNum() {
+      return this.deviceNum;
+   }
+
+   public String getMacOrderId() {
+      return this.macOrderId;
+   }
+
+   public LocalDateTime getRechargeTime() {
+      return this.rechargeTime;
+   }
+
+   public String getCrby() {
+      return this.crby;
+   }
+
+   public LocalDateTime getCrtime() {
+      return this.crtime;
+   }
+
+   public void setId(final Long id) {
+      this.id = id;
+   }
+
+   public void setCustId(final Long custId) {
+      this.custId = custId;
+   }
+
+   public void setAmount(final BigDecimal amount) {
+      this.amount = amount;
+   }
+
+   public void setErrorMsg(final String errorMsg) {
+      this.errorMsg = errorMsg;
+   }
+
+   public void setDeviceSn(final String deviceSn) {
+      this.deviceSn = deviceSn;
+   }
+
+   public void setDeviceName(final String deviceName) {
+      this.deviceName = deviceName;
+   }
+
+   public void setDeviceNum(final String deviceNum) {
+      this.deviceNum = deviceNum;
+   }
+
+   public void setMacOrderId(final String macOrderId) {
+      this.macOrderId = macOrderId;
+   }
+
+   public void setRechargeTime(final LocalDateTime rechargeTime) {
+      this.rechargeTime = rechargeTime;
+   }
+
+   public void setCrby(final String crby) {
+      this.crby = crby;
+   }
+
+   public void setCrtime(final LocalDateTime crtime) {
+      this.crtime = crtime;
+   }
+
+
+   public String toString() {
+      Long var10000 = this.getId();
+      return "AccTradeCashError(id=" + var10000 + ", custId=" + this.getCustId() + ", amount=" + String.valueOf(this.getAmount()) + ", errorMsg=" + this.getErrorMsg() + ", deviceSn=" + this.getDeviceSn() + ", deviceName=" + this.getDeviceName() + ", deviceNum=" + this.getDeviceNum() + ", macOrderId=" + this.getMacOrderId() + ", rechargeTime=" + String.valueOf(this.getRechargeTime()) + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/model/AccTradeRepealError.java

@@ -0,0 +1,98 @@
+package com.bonus.canteen.core.account.v3.model;
+
+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 java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@TableName("acc_trade_repeal_error")
+public class AccTradeRepealError implements Serializable {
+   @TableId(
+      type = IdType.AUTO
+   )
+   private Long id;
+   private Long custId;
+   private Integer walletId;
+   private BigDecimal amount;
+   private String errorMsg;
+   private Long originTradeId;
+   private String crby;
+   private LocalDateTime crtime;
+   @TableField(
+      exist = false
+   )
+   private static final long serialVersionUID = 1L;
+
+   public Long getId() {
+      return this.id;
+   }
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public Integer getWalletId() {
+      return this.walletId;
+   }
+
+   public BigDecimal getAmount() {
+      return this.amount;
+   }
+
+   public String getErrorMsg() {
+      return this.errorMsg;
+   }
+
+   public Long getOriginTradeId() {
+      return this.originTradeId;
+   }
+
+   public String getCrby() {
+      return this.crby;
+   }
+
+   public LocalDateTime getCrtime() {
+      return this.crtime;
+   }
+
+   public void setId(final Long id) {
+      this.id = id;
+   }
+
+   public void setCustId(final Long custId) {
+      this.custId = custId;
+   }
+
+   public void setWalletId(final Integer walletId) {
+      this.walletId = walletId;
+   }
+
+   public void setAmount(final BigDecimal amount) {
+      this.amount = amount;
+   }
+
+   public void setErrorMsg(final String errorMsg) {
+      this.errorMsg = errorMsg;
+   }
+
+   public void setOriginTradeId(final Long originTradeId) {
+      this.originTradeId = originTradeId;
+   }
+
+   public void setCrby(final String crby) {
+      this.crby = crby;
+   }
+
+   public void setCrtime(final LocalDateTime crtime) {
+      this.crtime = crtime;
+   }
+
+   public String toString() {
+      Long var10000 = this.getId();
+      return "AccTradeRepealError(id=" + var10000 + ", custId=" + this.getCustId() + ", walletId=" + this.getWalletId() + ", amount=" + String.valueOf(this.getAmount()) + ", errorMsg=" + this.getErrorMsg() + ", originTradeId=" + this.getOriginTradeId() + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/po/AccClearSubPO.java

@@ -0,0 +1,68 @@
+package com.bonus.canteen.core.account.v3.po;
+
+import java.math.BigDecimal;
+
+public class AccClearSubPO {
+   private Long tradeId;
+   private BigDecimal clearAmount;
+
+   public static AccClearSubPOBuilder builder() {
+      return new AccClearSubPOBuilder();
+   }
+
+   public Long getTradeId() {
+      return this.tradeId;
+   }
+
+   public BigDecimal getClearAmount() {
+      return this.clearAmount;
+   }
+
+   public void setTradeId(final Long tradeId) {
+      this.tradeId = tradeId;
+   }
+
+   public void setClearAmount(final BigDecimal clearAmount) {
+      this.clearAmount = clearAmount;
+   }
+
+   public String toString() {
+      Long var10000 = this.getTradeId();
+      return "AccClearSubPO(tradeId=" + var10000 + ", clearAmount=" + String.valueOf(this.getClearAmount()) + ")";
+   }
+
+   public AccClearSubPO(final Long tradeId, final BigDecimal clearAmount) {
+      this.tradeId = tradeId;
+      this.clearAmount = clearAmount;
+   }
+
+   public AccClearSubPO() {
+   }
+
+   public static class AccClearSubPOBuilder {
+      private Long tradeId;
+      private BigDecimal clearAmount;
+
+      AccClearSubPOBuilder() {
+      }
+
+      public AccClearSubPOBuilder tradeId(final Long tradeId) {
+         this.tradeId = tradeId;
+         return this;
+      }
+
+      public AccClearSubPOBuilder clearAmount(final BigDecimal clearAmount) {
+         this.clearAmount = clearAmount;
+         return this;
+      }
+
+      public AccClearSubPO build() {
+         return new AccClearSubPO(this.tradeId, this.clearAmount);
+      }
+
+      public String toString() {
+         Long var10000 = this.tradeId;
+         return "AccClearSubPO.AccClearSubPOBuilder(tradeId=" + var10000 + ", clearAmount=" + String.valueOf(this.clearAmount) + ")";
+      }
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/po/AccInfoAddPO.java

@@ -0,0 +1,74 @@
+package com.bonus.canteen.core.account.v3.po;
+
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+
+public class AccInfoAddPO {
+   @ApiModelProperty("用户id")
+   public @NotNull(
+   message = "请填写用户id"
+) Long custId;
+   @ApiModelProperty("账户有效截止日期")
+   public LocalDate endDate;
+
+   public static AccInfoAddPOBuilder builder() {
+      return new AccInfoAddPOBuilder();
+   }
+
+   public Long getCustId() {
+      return this.custId;
+   }
+
+   public LocalDate getEndDate() {
+      return this.endDate;
+   }
+
+   public void setCustId(final Long custId) {
+      this.custId = custId;
+   }
+
+   public void setEndDate(final LocalDate endDate) {
+      this.endDate = endDate;
+   }
+
+   public String toString() {
+      Long var10000 = this.getCustId();
+      return "AccInfoAddPO(custId=" + var10000 + ", endDate=" + String.valueOf(this.getEndDate()) + ")";
+   }
+
+   public AccInfoAddPO(final Long custId, final LocalDate endDate) {
+      this.custId = custId;
+      this.endDate = endDate;
+   }
+
+   public AccInfoAddPO() {
+   }
+
+   public static class AccInfoAddPOBuilder {
+      private Long custId;
+      private LocalDate endDate;
+
+      AccInfoAddPOBuilder() {
+      }
+
+      public AccInfoAddPOBuilder custId(final Long custId) {
+         this.custId = custId;
+         return this;
+      }
+
+      public AccInfoAddPOBuilder endDate(final LocalDate endDate) {
+         this.endDate = endDate;
+         return this;
+      }
+
+      public AccInfoAddPO build() {
+         return new AccInfoAddPO(this.custId, this.endDate);
+      }
+
+      public String toString() {
+         Long var10000 = this.custId;
+         return "AccInfoAddPO.AccInfoAddPOBuilder(custId=" + var10000 + ", endDate=" + String.valueOf(this.endDate) + ")";
+      }
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/po/AccRefundPO.java

@@ -0,0 +1,47 @@
+package com.bonus.canteen.core.account.v3.po;
+
+import java.math.BigDecimal;
+
+public class AccRefundPO {
+   private Long auditId;
+   private BigDecimal actualAmount;
+   private BigDecimal cashAmount;
+   private String errorMsg;
+
+   public Long getAuditId() {
+      return this.auditId;
+   }
+
+   public BigDecimal getActualAmount() {
+      return this.actualAmount;
+   }
+
+   public BigDecimal getCashAmount() {
+      return this.cashAmount;
+   }
+
+   public String getErrorMsg() {
+      return this.errorMsg;
+   }
+
+   public void setAuditId(final Long auditId) {
+      this.auditId = auditId;
+   }
+
+   public void setActualAmount(final BigDecimal actualAmount) {
+      this.actualAmount = actualAmount;
+   }
+
+   public void setCashAmount(final BigDecimal cashAmount) {
+      this.cashAmount = cashAmount;
+   }
+
+   public void setErrorMsg(final String errorMsg) {
+      this.errorMsg = errorMsg;
+   }
+
+   public String toString() {
+      Long var10000 = this.getAuditId();
+      return "AccRefundPO(auditId=" + var10000 + ", actualAmount=" + String.valueOf(this.getActualAmount()) + ", cashAmount=" + String.valueOf(this.getCashAmount()) + ", errorMsg=" + this.getErrorMsg() + ")";
+   }
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccBatchOperateService.java

@@ -0,0 +1,20 @@
+package com.bonus.canteen.core.account.v3.service;
+
+
+import com.bonus.canteen.core.account.v3.web.dto.AccBatchRechargeCheckDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccRepairDeductBatchDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccSubClearBatchDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccTransferBatchDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccBatchCommonCheckVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccBatchRechargeCheckVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccBatchRepairCheckVO;
+
+public interface AccBatchOperateService {
+   AccBatchRechargeCheckVO checkAccBatchRecharge(AccBatchRechargeCheckDTO content);
+
+   AccBatchRepairCheckVO checkAccBatchRepairDeduct(AccRepairDeductBatchDTO repairDeductBatchDTO);
+
+   AccBatchCommonCheckVO checkAccBatchClear(AccSubClearBatchDTO content);
+
+   AccBatchCommonCheckVO checkAccBatchTransfer(AccTransferBatchDTO content);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccBusinessService.java

@@ -1,9 +1,11 @@
 package com.bonus.canteen.core.account.v3.service;
 
 
+import com.bonus.canteen.core.account.v3.dto.AccWalletUpdateDTO;
 import com.bonus.canteen.core.account.v3.po.AccConsumeUpdateWalletPO;
 import com.bonus.canteen.core.account.v3.web.dto.AccRechargeBackDTO;
 import com.bonus.canteen.core.account.v3.web.vo.AccConsumeWalletVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccUpdateWalletBalanceVO;
 
 
 public interface AccBusinessService {
@@ -11,4 +13,8 @@ public interface AccBusinessService {
    AccConsumeWalletVO doConsumeUpdateWalletAndAddTradeV2(AccConsumeUpdateWalletPO updateWalletPO);
 
    void accRechargeModifyAndUpdate(AccRechargeBackDTO accRechargeBackDTO);
+
+   Long doUpdateWalletAndAddTrade(AccWalletUpdateDTO updateWalletPo);
+
+   AccUpdateWalletBalanceVO doUpdateWalletAndAddTradeV2(AccWalletUpdateDTO updateWalletPo);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccDeductionConfService.java

@@ -0,0 +1,16 @@
+package com.bonus.canteen.core.account.v3.service;
+
+
+import com.bonus.canteen.core.account.v3.web.dto.AccDeductionAddDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccDeductionConfListDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccDeductionConfVO;
+
+import java.util.List;
+
+public interface AccDeductionConfService {
+   void addAccDeductionConf(AccDeductionAddDTO addDTO);
+
+   List<AccDeductionConfVO> listAccDeductionConf(AccDeductionConfListDTO listVO);
+
+   void updateAppletDeductionCache(String accPayOrder);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccDrawAuditService.java

@@ -0,0 +1,51 @@
+package com.bonus.canteen.core.account.v3.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bonus.canteen.core.account.v3.app.dto.AppApplyDrawDTO;
+import com.bonus.canteen.core.account.v3.app.dto.AppDrawAuditPageDTO;
+import com.bonus.canteen.core.account.v3.app.vo.AppDrawAuditPageVO;
+import com.bonus.canteen.core.account.v3.model.AccDrawAudit;
+import com.bonus.canteen.core.account.v3.web.dto.AccPendingCountDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccWithDrawAuditDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccWithDrawPageDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccDrawAvailableVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccWalletInfoVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccWithDrawApplyPageVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccWithDrawApplyV4PageVO;
+import com.bonus.canteen.core.common.page.PageVO;
+import com.bonus.canteen.core.report.vo.ReportBaseTotalVO;
+
+import java.util.List;
+
+public interface AccDrawAuditService extends IService<AccDrawAudit> {
+   Page<AccWithDrawApplyPageVO> queryWithdrawApplyRecordPage(AccWithDrawPageDTO content);
+
+   List<AccWithDrawApplyPageVO> queryWithdrawApplyRecordList(AccWithDrawPageDTO content);
+
+   ReportBaseTotalVO<AccWithDrawApplyPageVO> queryWithdrawApplyApprovalRecordPage(AccWithDrawPageDTO content);
+
+   List<AccWithDrawApplyPageVO> queryWithdrawApplyApprovalRecordList(AccWithDrawPageDTO content);
+
+   void updateAccWithDrawStatus(AccWithDrawAuditDTO auditDTO);
+
+   Long addAccDrawAudit(AppApplyDrawDTO appApplyDrawDTO);
+
+   Page<AppDrawAuditPageVO> queryPageAccDrawAuditForApp(AppDrawAuditPageDTO appDrawAuditPageDTO);
+
+   long getCustIdApplyCount(Long custId);
+
+   AccDrawAvailableVO getAvailableAmountForWithdraw(Long custId);
+
+   AccDrawAvailableVO getAvailableAmountForWithdraw(Long custId, List<AccWalletInfoVO> walletInfoList);
+
+   void auditWithDrawApply(AccWithDrawAuditDTO auditDTO);
+
+   void didEndFlow(AccWithDrawAuditDTO accWithDrawAuditDTO);
+
+   Long monitorPendingCount(AccPendingCountDTO content);
+
+   PageVO<AccWithDrawApplyV4PageVO> queryAccWithDrawApplyPageV4(AccWithDrawPageDTO content);
+
+   AccWithDrawApplyV4PageVO getAccWithDrawApplyPageV4Total(AccWithDrawPageDTO content);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccExceptionRecordService.java

@@ -1,12 +1,17 @@
 package com.bonus.canteen.core.account.v3.service;
 
+import com.bonus.canteen.core.account.v3.api.vo.AccExceptionRecordApiVO;
 import com.bonus.canteen.core.account.v3.web.dto.AccAddExceptionRecordDTO;
 import com.bonus.canteen.core.account.v3.web.dto.AccUpdateExceptionRecordDTO;
 
+import java.util.List;
+
 public interface AccExceptionRecordService {
    void addAccExceptionRecord(AccAddExceptionRecordDTO addDTO);
 
    void updateAccExceptionRecord(AccUpdateExceptionRecordDTO updateDTO);
 
    boolean existExceptionRecordByRelatedId(Long relatedId, Integer recordStatus);
+
+   List<AccExceptionRecordApiVO> listAccExceptionRecord(List<Long> ordTradeIdList);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccFrozenService.java

@@ -0,0 +1,34 @@
+package com.bonus.canteen.core.account.v3.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bonus.canteen.core.account.v3.web.dto.*;
+import com.bonus.canteen.core.account.v3.web.vo.*;
+import com.bonus.canteen.core.common.page.PageVO;
+
+public interface AccFrozenService {
+   void singleAccFrozen(AccFrozenDTO frozenDTO);
+
+   void batchFrozenAccUpdate(AccFrozenBatchDTO frozenBatchDTO);
+
+   void frozenWalletForFrozenRule(AccFrozenBatchDTO frozenBatchDTO);
+
+   void singleAccUnFrozen(AccUnFreezeDTO unFreezeDTO);
+
+   void batchUnFrozenAccUpdate(AccUnFrozenBatchDTO unFrozenBatchDTO);
+
+   void unFrozenWalletForUnFrozenRule(AccUnFrozenBatchDTO unFrozenBatchDTO);
+
+   AccFrozenPageSumVO queryAccFrozenPage(AccFrozenPageDTO pageDTO);
+
+   PageVO<AccFrozenPageVO> queryAccFrozenPageV4(AccFrozenPageDTO pageDTO);
+
+   AccFrozenPageVO getAccFrozenPageV4Total(AccFrozenPageDTO pageDTO);
+
+   AccUnFrozenPageSumVO queryAccUnFrozenPage(AccFrozenPageDTO pageDTO);
+
+   PageVO<AccUnFrozenPageVO> queryAccUnFrozenPageV4(AccFrozenPageDTO pageDTO);
+
+   AccUnFrozenPageVO getAccUnFrozenPageV4Total(AccFrozenPageDTO pageDTO);
+
+   Page<AccExistFrozenListVO> queryFrozenAccPage(AccExistFrozenPageDTO pageDTO);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccInfoHandleBusiness.java

@@ -5,9 +5,16 @@ import com.bonus.canteen.core.account.v3.po.AccPayPO;
 import com.bonus.canteen.core.account.v3.web.vo.AccInfoVO;
 import com.bonus.canteen.core.marketing.v2.rule.price.dto.RulePriceResultDTO;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 
 public interface AccInfoHandleBusiness {
    AccPayPO amountCalculationByRulePrice(AccInfoVO accInfoVO, List<Integer> walletIdList, RulePriceResultDTO resultDTO);
+
+   Map<Integer, BigDecimal> getMerchantLimitConfig();
+
+   BigDecimal calculateCanUseTotalAmount(AccInfoVO accInfoVO, Map<Integer, BigDecimal> merchantLimitConfig, List<Integer> walletIdList);
+
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccInfoService.java

@@ -1,17 +1,57 @@
 package com.bonus.canteen.core.account.v3.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bonus.canteen.core.account.v3.api.dto.AccStatisticsSumDTO;
 import com.bonus.canteen.core.account.v3.api.vo.AccInfoDetailVO;
+import com.bonus.canteen.core.account.v3.api.vo.AccStatisticsSumVO;
+import com.bonus.canteen.core.account.v3.po.AccInfoAddPO;
 import com.bonus.canteen.core.account.v3.po.AccInfoUpdatePO;
-import com.bonus.canteen.core.account.v3.web.dto.AccInfoDetailDTO;
+import com.bonus.canteen.core.account.v3.web.dto.*;
+import com.bonus.canteen.core.account.v3.web.vo.AccExistFrozenListVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccInfoExpiredCountVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccInfoPageSumVO;
 import com.bonus.canteen.core.account.v3.web.vo.AccInfoVO;
+import com.bonus.common.core.exception.ServiceException;
+
+import java.util.List;
 
 public interface AccInfoService {
    AccInfoDetailVO getAccInfoDetail(AccInfoDetailDTO content);
 
+   Long insertAccInfo(AccInfoAddPO accInfoAddPO);
    void updateAccInfo(AccInfoUpdatePO updatePO);
 
 
    AccInfoVO getAccInfoVoByCustId(Long custId);
 
    void checkAccInfoAndStatus(AccInfoVO accInfoVO);
+
+   AccInfoExpiredCountVO queryAccInfoExpiredCount();
+
+   AccInfoPageSumVO queryPageAccInfo(AccInfoPageDTO accPageParam);
+
+   AccInfoPageSumVO queryPageAccInfoSum(AccInfoPageDTO accPageParam);
+
+   AccInfoPageSumVO queryPageAccInfoForBatch(AccInfoPageDTO accPageParam);
+
+   void updateSingle(AccUpdateSingleDTO accUpdateSingleDTO);
+
+   void updateBatch(AccUpdateBatchDTO accUpdateBatchDTO);
+
+   void updateAccStateByCustId(Long custId, Integer accStatus);
+
+   List<AccInfoVO> listAccInfoNoWalletInfoByCustIds(List<Long> custIdList);
+
+   List<AccInfoVO> listAccInfoVoByCustIdList(List<Long> custIdList);
+
+   AccInfoVO getOneAccInfoNoWalletInfoByCustId(Long custId);
+
+   void checkAccInfoExist(AccInfoVO accInfoVO) throws ServiceException;
+
+   Long getCustIdBySerialNum(String serialNum);
+
+   Page<AccExistFrozenListVO> queryFrozenAccPage(Page<?> page, AccExistFrozenPageDTO pageDTO);
+
+   List<AccInfoVO> queryAccBaseInfoList(List<Long> custIdList);
+   AccStatisticsSumVO accStatisticsSum(AccStatisticsSumDTO accStatisticsSumDTO);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccOperationRecordService.java

@@ -0,0 +1,16 @@
+package com.bonus.canteen.core.account.v3.service;
+
+
+import com.bonus.canteen.core.account.v3.web.dto.AccOperationRecordPageDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccOperationRecordPageVO;
+import com.bonus.canteen.core.common.page.PageVO;
+
+import java.util.List;
+
+public interface AccOperationRecordService {
+   PageVO<AccOperationRecordPageVO> queryPageAccOperationRecord(AccOperationRecordPageDTO content);
+
+   List<AccOperationRecordPageVO> queryAccOperationRecord(AccOperationRecordPageDTO content);
+
+   void addAccOperationRecord(Long custId, Integer type);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccRedService.java

@@ -0,0 +1,36 @@
+package com.bonus.canteen.core.account.v3.service;
+
+import com.bonus.canteen.core.account.v3.web.dto.*;
+import com.bonus.canteen.core.account.v3.web.vo.AccRedCollectVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccRedImportVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccRedRechargePageSumVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccRedRechargePageVO;
+import com.bonus.canteen.core.common.page.PageVO;
+import com.bonus.canteen.core.report.vo.ReportBaseTotalVO;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+public interface AccRedService {
+   void singleRedRecharge(AccRedRechargeSingleDTO singleDTO);
+
+   void batchAccRedRecharge(AccRedRechargeBatchDTO batchDTO);
+
+   AccRedImportVO batchImportRedCheck(MultipartFile excel, AccRedImportModel accRedImportModel);
+
+   void batchImportAccRed(AccRedImportDTO content);
+
+   AccRedRechargePageSumVO queryAccRedRechargePage(AccRedRechargePageDTO pageDTO);
+
+   PageVO<AccRedRechargePageVO> queryAccRedRechargePageV4(AccRedRechargePageDTO pageDTO);
+
+   AccRedRechargePageVO getAccRedRechargePageV4Total(AccRedRechargePageDTO pageDTO);
+
+   ReportBaseTotalVO<AccRedCollectVO> queryAccRedRechargeCollectPage(AccRedRechargeCollectDTO content);
+
+   PageVO<AccRedCollectVO> queryAccRedRechargeSummaryPageV4(AccRedRechargeCollectDTO content);
+
+   AccRedCollectVO getAccRedRechargeSummaryPageV4Total(AccRedRechargeCollectDTO content);
+
+   List<AccRedCollectVO> queryAccRedRechargeCollectList(AccRedRechargeCollectDTO content);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccRepairDeductService.java

@@ -0,0 +1,25 @@
+package com.bonus.canteen.core.account.v3.service;
+
+import com.bonus.canteen.core.account.v3.web.dto.*;
+import com.bonus.canteen.core.account.v3.web.vo.AccConsumeCheckVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccRepairErrorPageVO;
+import com.bonus.canteen.core.common.page.PageVO;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+public interface AccRepairDeductService {
+   void singleAccRepairDeduct(AccRepairDeductSingleDTO repairDeductSingleDTO);
+
+   void batchAccRepairDeduct(AccRepairDeductBatchDTO repairDeductBatchDTO);
+
+   PageVO<AccRepairErrorPageVO> queryAccRepairErrorPage(AccRepairErrorPageDTO pageDTO);
+
+   List<AccRepairErrorPageVO> queryAccRepairErrorList(AccRepairErrorPageDTO pageDTO);
+
+   AccConsumeCheckVO batchAccRepairDeductCheck(MultipartFile excel, AccConsumeCheckImportModel accConsumeCheckImportModel);
+
+   AccConsumeCheckVO batchAccMobileRepairDeductCheck(MultipartFile excel, AccMobileConsumeCheckImportModel accMobileConsumeCheckImportModel);
+
+   void batchAccConsumeImportExcel(List<AccConsumeExcelImportDTO> dto);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccRepairErrorService.java

@@ -0,0 +1,15 @@
+package com.bonus.canteen.core.account.v3.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bonus.canteen.core.account.v3.model.AccRepairError;
+import com.bonus.canteen.core.account.v3.web.dto.AccRepairErrorPageDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccRepairErrorPageVO;
+
+import java.util.List;
+
+public interface AccRepairErrorService extends IService<AccRepairError> {
+   Page<AccRepairErrorPageVO> queryAccRepairErrorPage(Page<AccRepairError> page, AccRepairErrorPageDTO pageDTO);
+
+   List<AccRepairErrorPageVO> queryAccRepairErrorList(AccRepairErrorPageDTO pageDTO);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccSubBusinessService.java

@@ -3,6 +3,7 @@ package com.bonus.canteen.core.account.v3.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.bonus.canteen.core.account.v3.web.dto.AccSubClearSingleDTO;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.canteen.core.account.v3.constants.AccRechargeOperateEnum;
 import com.bonus.canteen.core.account.v3.constants.AccSubClearOpSourceEnum;
@@ -49,7 +50,12 @@ public class AccSubBusinessService {
    private AccTradeWalletDetailService accTradeWalletDetailService;
    @Autowired
    private AccTradeUseAmountHistService accTradeUseAmountHistService;
-
+   @Autowired
+   @Lazy
+   private AccBusinessService accBusinessService;
+   @Autowired
+   @Lazy
+   private AccSendMq accSendMq;
 
    public void subsidyChangeBusiness(List<RepAccMqModel> resultList) {
       if (!CollUtil.isEmpty(resultList)) {
@@ -164,6 +170,52 @@ public class AccSubBusinessService {
          this.accTradeUseAmountHistService.insertUseAmountHist(accTradeUseAmountHist);
          calculateAmount = NumberUtil.sub(calculateAmount, min);
       } while(calculateAmount.compareTo(BigDecimal.ZERO) > 0);
+   }
 
+   @Transactional(
+           rollbackFor = {Exception.class},
+           propagation = Propagation.REQUIRES_NEW
+   )
+   public void singleClearExpiredSub(AccInfoVO accInfoVO, List<AccTradeWalletDetail> walletDetailList) {
+      if (!CollUtil.isEmpty(walletDetailList)) {
+         BigDecimal rechargeAmountSum = walletDetailList.stream().map(AccTradeWalletDetail::getAmount).filter(ObjectUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+         BigDecimal useAmountSum = walletDetailList.stream().map(AccTradeWalletDetail::getUseAmount).filter(ObjectUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+         BigDecimal noUseAmount = rechargeAmountSum.subtract(useAmountSum).max(BigDecimal.ZERO);
+         BigDecimal subBalAll = accInfoVO.getWalletInfoList().stream().map((item) -> {
+            return item.getWalletBal().add(item.getFrozenBalance());
+         }).reduce(BigDecimal.ZERO, BigDecimal::add);
+         if (subBalAll.compareTo(BigDecimal.ZERO) > 0) {
+            BigDecimal expiredClearAmount = subBalAll.min(noUseAmount);
+            BigDecimal subBal = AccUtils.getWalletBal(accInfoVO.getWalletInfoList(), AccWalletIdEnum.SUBSIDY.getKey());
+            if (expiredClearAmount.compareTo(subBal) > 0) {
+               AccSubClearSingleDTO content = new AccSubClearSingleDTO();
+               content.setClearOperateSource(AccSubClearOpSourceEnum.CLEAR_MANUAL.getKey());
+               this.accUnFrozenHandleBusiness(accInfoVO, expiredClearAmount.subtract(subBal));
+            }
+
+            AccWalletUpdateDTO accWalletUpdateDTO = AccWalletUpdateDTO.builder().custId(accInfoVO.getCustId()).orgId(accInfoVO.getOrgId()).psnType(accInfoVO.getPsnType()).walletId(AccWalletIdEnum.SUBSIDY.getKey()).amount(expiredClearAmount).updateWalletOperateEnum(AccUpdateWalletOperateEnum.DECREASE_BAL).tradeType(AccTradeTypeEnum.CLEAR.getKey()).operateSource(AccSubClearOpSourceEnum.CLEAR_EXPIRED.getKey()).remark("过期清空").build();
+            Long tradeId = this.accBusinessService.doUpdateWalletAndAddTrade(accWalletUpdateDTO);
+            this.sendAccSendMq(Collections.singletonList(tradeId));
+         }
+      }
+   }
+
+   protected void accUnFrozenHandleBusiness(AccInfoVO accInfoVO, BigDecimal amount) {
+      BigDecimal walletFrozenBal = AccUtils.getWalletFrozenBal(accInfoVO.getWalletInfoList(), AccWalletIdEnum.SUBSIDY.getKey());
+      BigDecimal unFrozenAmount = amount.min(walletFrozenBal);
+      if (unFrozenAmount.compareTo(BigDecimal.ZERO) > 0) {
+         AccWalletUpdateDTO accWalletUpdateDTO = AccWalletUpdateDTO.builder().custId(accInfoVO.getCustId()).orgId(accInfoVO.getOrgId()).psnType(accInfoVO.getPsnType()).walletId(AccWalletIdEnum.SUBSIDY.getKey()).amount(unFrozenAmount).updateWalletOperateEnum(AccUpdateWalletOperateEnum.UNFROZEN_BAL).tradeType(AccTradeTypeEnum.UN_FREEZE.getKey()).rechargeOperate(AccRechargeOperateEnum.SINGLE_RECHARGE.getKey()).remark("过期清空,解冻金额").build();
+         Long tradeId = this.accBusinessService.doUpdateWalletAndAddTrade(accWalletUpdateDTO);
+         this.sendAccSendMq(Collections.singletonList(tradeId));
+      }
+   }
+
+   protected void sendAccSendMq(List<Long> tradeIdList) {
+      if (CollUtil.isNotEmpty(tradeIdList)) {
+         List<RepAccMqDTO> sendList = tradeIdList.stream().map((item) -> {
+            return RepAccMqDTO.builder().tradeId(item).build();
+         }).collect(Collectors.toList());
+         this.accSendMq.accTradeSendHandle(TenantContextHolder.getTenantId(), sendList);
+      }
    }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccSubHandReceiveService.java

@@ -0,0 +1,41 @@
+package com.bonus.canteen.core.account.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bonus.canteen.core.account.v3.app.vo.AppPersonSubRuleVO;
+import com.bonus.canteen.core.account.v3.model.AccSubHandReceive;
+import com.bonus.canteen.core.account.v3.web.dto.AccSubHandReceiveAddDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccSubHandReceiveBatchDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccSubHandReceivePageDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccSubHandReceiveSingleDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccSubHandReceiveBatchVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccSubHandReceivePageVO;
+import com.bonus.canteen.core.common.page.PageVO;
+import com.bonus.canteen.core.report.vo.ReportBaseTotalVO;
+
+import java.util.List;
+
+public interface AccSubHandReceiveService extends IService<AccSubHandReceive> {
+   void expiredSubHandReceive();
+
+   ReportBaseTotalVO<AccSubHandReceivePageVO> queryAccSubHandReceivePage(AccSubHandReceivePageDTO content);
+
+   PageVO<AccSubHandReceivePageVO> queryAccSubHandReceivePageV4(AccSubHandReceivePageDTO content);
+
+   AccSubHandReceivePageVO getAccSubHandReceivePageV4Total(AccSubHandReceivePageDTO content);
+
+   List<AccSubHandReceivePageVO> queryAccSubHandReceivePageExport(AccSubHandReceivePageDTO content);
+
+   void singleRepealSubHandReceive(AccSubHandReceiveSingleDTO content);
+
+   void batchRepealSubHandReceive(AccSubHandReceiveBatchDTO content);
+
+   void singleGrantSubHandReceive(AccSubHandReceiveSingleDTO content);
+
+   AccSubHandReceiveBatchVO batchGrantSubHandReceive(AccSubHandReceiveBatchDTO content);
+
+   void addAccSubHandReceiveV2(String operatorName, AccSubHandReceiveAddDTO addDTO);
+
+   List<AppPersonSubRuleVO> listAccSubHandReceiveByCustId(Long custId);
+
+   Long countAccSUbRuleTimeDay(Long timeId);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccSubService.java

@@ -0,0 +1,86 @@
+package com.bonus.canteen.core.account.v3.service;
+
+import com.bonus.canteen.core.account.v3.api.dto.AccSubRechargeApiDTO;
+import com.bonus.canteen.core.account.v3.api.vo.AccRechargeResultApiVO;
+import com.bonus.canteen.core.account.v3.app.dto.AccReceiveSubRuleDTO;
+import com.bonus.canteen.core.account.v3.app.dto.AccRuleSendSubDTO;
+import com.bonus.canteen.core.account.v3.app.vo.AppPersonSubRuleVO;
+import com.bonus.canteen.core.account.v3.web.dto.*;
+import com.bonus.canteen.core.account.v3.web.vo.*;
+import com.bonus.canteen.core.common.page.PageVO;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface AccSubService {
+   void singleAccSubRecharge(AccSubRechargeSingleDTO singleDTO);
+
+   AccBatchRechargeVO batchAccSubRecharge(AccSubRechargeBatchDTO batchDTO);
+
+   void singleClearAccSub(AccSubClearSingleDTO clearSingleDTO);
+
+   void batchClearAccSub(AccSubClearBatchDTO clearBatchDTO);
+
+   void clearAccSubForTimeRule(AccSubClearBatchDTO clearBatchDTO);
+
+   AccSubRechargePageSumVO queryAccSubRechargePage(AccSubRechargePageDTO pageDTO);
+
+   PageVO<AccSubRechargePageVO> queryAccSubRechargePageV4(AccSubRechargePageDTO pageDTO);
+
+   AccSubRechargePageVO getAccSubRechargePageV4Total(AccSubRechargePageDTO pageDTO);
+
+   AccSubClearPageSumVO queryAccSubClearPage(AccSubClearPageDTO pageDTO);
+
+   PageVO<AccSubClearPageVO> queryAccSubClearPageV4(AccSubClearPageDTO pageDTO);
+
+   AccSubClearPageVO getAccSubClearPageV4Total(AccSubClearPageDTO pageDTO);
+
+   AccSubCollectSumVO queryAccSubRechargeCollectPage(AccSubRechargeCollectDTO content);
+
+   PageVO<AccSubCollectVO> queryAccSubRechargeSummaryPageV4(AccSubRechargeCollectDTO content);
+
+   AccSubCollectVO getAccSubRechargeSummaryPageV4Total(AccSubRechargeCollectDTO content);
+
+   List<AccSubCollectVO> queryAccSubRechargeCollectList(AccSubRechargeCollectDTO content);
+
+   AccSubImportVO batchImportSubCheck(MultipartFile excel, AccSubImportModel accSubImportModel);
+
+   void batchImportAccSub(AccSubImportDTO content);
+
+   void subRechargeByOrderId(AccInfoVO accInfoVO, BigDecimal amount, String userName, Long orderId);
+
+   List<AppPersonSubRuleVO> appMonthPersonList(AppSubListDTO dto);
+
+   void receiveBySubsidyRuleId(AccReceiveSubRuleDTO receiveSubRuleDTO);
+
+   void ruleSendSubsidy(AccRuleSendSubDTO sendAndClearSubDTO);
+
+   AccRechargeResultApiVO thirdPersonAccRechargeForSub(AccSubRechargeApiDTO accSubRechargeApiDTO);
+
+   void singleRepealAccTrade(AccRepealSingleDTO singleDTO);
+
+   void batchRepealAccTrade(AccRepealBatchDTO batchDTO);
+
+   void batchNumRepealAccTrade(AccRepealBatchNumDTO batchNumDTO);
+
+   AccSubRepealPageSumVO queryRepealAccTradePage(AccTradeRepealPageDTO pageDTO);
+
+   PageVO<AccSubRepealPageVO> queryRepealAccTradePageV4(AccTradeRepealPageDTO pageDTO);
+
+   AccSubRepealPageVO getRepealAccTradePageV4Total(AccTradeRepealPageDTO pageDTO);
+
+   List<AccSubRepealPageVO> listRepealAccTrade(AccTradeRepealPageDTO pageDTO);
+
+   Long refundRechargeForOpen(Long rechargeTradeId, String thirdRefundNum, String remark);
+
+   AccImportCommonVO<AccClearImportSucVO, AccClearImportErrVO> importClearAccSubCheck(MultipartFile excel, AccSubClearImportModel accSubClearImportModel);
+
+   void importAccClearStart(AccClearImportDTO content);
+
+   BigDecimal calculateClearAmount(AccInfoVO accInfoVO, Integer clearType, BigDecimal amount);
+
+   void asyncBatchAccSubRechargeV4(AccSubRechargeBatchDTO content);
+
+   void subExpiredClearTask();
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccSubTimeRangeService.java

@@ -0,0 +1,7 @@
+package com.bonus.canteen.core.account.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bonus.canteen.core.account.v3.model.AccSubTimeRange;
+
+public interface AccSubTimeRangeService extends IService<AccSubTimeRange> {
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccSubTimeService.java

@@ -0,0 +1,22 @@
+package com.bonus.canteen.core.account.v3.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bonus.canteen.core.account.v3.web.dto.AccSubTimeAddDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccSubTimePageDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccSubTimeUpdateDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccSubTimeUpdateStateDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccSubTimePageVO;
+
+public interface AccSubTimeService {
+   Page<AccSubTimePageVO> queryAccSubTimePage(AccSubTimePageDTO pageDTO);
+
+   void insertAccSubTime(AccSubTimeAddDTO addDTO);
+
+   void updateAccSubTime(AccSubTimeUpdateDTO content);
+
+   void updateAccSubRuleState(AccSubTimeUpdateStateDTO updateStateDTO);
+
+   void accSubRuleTask(Integer day);
+
+   void subReciveTask();
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccTradeCashErrorService.java

@@ -0,0 +1,13 @@
+package com.bonus.canteen.core.account.v3.service;
+
+
+import com.bonus.canteen.core.account.dto.MacAccErrorRecordDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccTradeCashPageDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccTradeCashPageVO;
+import com.bonus.canteen.core.common.page.PageVO;
+
+public interface AccTradeCashErrorService {
+   void saveAccTradeCashError(MacAccErrorRecordDTO macAccErrorRecordDTO);
+
+   PageVO<AccTradeCashPageVO> queryAccTradeCashErrorV4(AccTradeCashPageDTO cashPageDTO);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccTradeRepealErrorService.java

@@ -0,0 +1,21 @@
+package com.bonus.canteen.core.account.v3.service;
+
+import com.bonus.canteen.core.account.v3.model.AccTradeRepealError;
+import com.bonus.canteen.core.account.v3.web.dto.AccTradeRepealErrorPageDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccTradeRepealPageSumVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccTradeRepealPageVO;
+import com.bonus.canteen.core.common.page.PageVO;
+
+import java.util.List;
+
+public interface AccTradeRepealErrorService {
+   void insertAccTradeRepealError(AccTradeRepealError repealError);
+
+   AccTradeRepealPageSumVO queryAccTradeRepealPage(AccTradeRepealErrorPageDTO content);
+
+   List<AccTradeRepealPageVO> listAccTradeRepealError(AccTradeRepealErrorPageDTO content);
+
+   PageVO<AccTradeRepealPageVO> queryAccTradeRepealPageV4(AccTradeRepealErrorPageDTO content);
+
+   AccTradeRepealPageVO getAccTradeRepealPageV4Total(AccTradeRepealErrorPageDTO content);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccTradeService.java

@@ -12,7 +12,9 @@ import com.bonus.canteen.core.account.v3.model.AccTradeWalletDetail;
 import com.bonus.canteen.core.account.v3.mq.send.model.RepAccMqModel;
 import com.bonus.canteen.core.account.v3.po.AccTradeAddPO;
 import com.bonus.canteen.core.account.v3.po.AccWalletPayPO;
-import com.bonus.canteen.core.account.v3.web.vo.AccInfoVO;
+import com.bonus.canteen.core.account.v3.web.dto.*;
+import com.bonus.canteen.core.account.v3.web.vo.*;
+import com.bonus.canteen.core.account.v4.vo.AccWalletRepealV4PageVO;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -36,4 +38,66 @@ public interface AccTradeService extends IService<AccTrade> {
    AppAccTradePageVO getOneTradeApp(Long accTradeId);
 
    List<AccTradeWalletDetail> listAccSubsidyTrade(Long custId, List<Integer> tradeTypeList);
+
+   void updateOrderNo(Long orderId, Long tradeId);
+
+   List<AccSubRechargePageVO> queryAccSubRechargeList(AccSubRechargePageDTO pageDTO);
+
+   AccSubRechargePageVO getTotalAccSubRechargePage(AccSubRechargePageDTO pageDTO);
+
+   List<AccSubClearPageVO> queryAccSubClearList(AccSubClearPageDTO pageDTO);
+
+   AccSubClearPageVO getTotalAccSubClearPage(AccSubClearPageDTO pageDTO);
+
+   List<AccSubCollectVO> queryAccSubRechargeCollectList(AccSubRechargeCollectDTO content);
+
+   AccSubCollectVO getTotalAccSubRechargeCollectAmount(AccSubRechargeCollectDTO content);
+
+   int getCustTimeForAdvanceReceiveSub(Long timeId, Long custId);
+
+   List<AccTradeAndDetailVO> listAccTrade(List<Long> tradeIdList, String batchNum, Integer tradeType);
+
+   List<AccSubRepealPageVO> listRepealAccSubTrade(AccTradeRepealPageDTO pageDTO);
+
+   BigDecimal getTotalRepealAccSubTradePage(AccTradeRepealPageDTO pageDTO);
+
+   List<Long> listCustIdForAdvanceReceiveSubByType(Long timeId, Integer subRuleType);
+
+   List<AccTrade> queryRechargeListByCustIdForWithdraw(Long custId, Long lastRechargeId, Integer tradeType);
+
+   List<AccWithdrawDetailPageVO> listAccWithdrawDetails(AccWithdrawDetailPageDTO content);
+
+   AccWithdrawDetailPageVO getTotalWithdrawAmount(AccWithdrawDetailPageDTO content);
+
+   List<AccWithdrawTradeTypePageVO> queryTradeTypeAccWithdrawSumList(AccWithdrawPageSumDTO content);
+
+   AccWithdrawTradeTypePageVO queryTradeTypeAccWithdrawAmountSum(AccWithdrawPageSumDTO content);
+
+   List<AccWithdrawPageVO> queryAccWithdrawListSum(AccWithdrawPageSumDTO content);
+
+   AccWithdrawPageVO queryAccWithdrawSumTotalAmount(AccWithdrawPageSumDTO content);
+
+   List<AccTransferPageVO> queryAccTransferList(AccTransferPageDTO pageDTO);
+
+   AccTransferPageVO getTotalAccTransferPage(AccTransferPageDTO pageDTO);
+
+   List<AccFrozenPageVO> queryAccFrozenPageList(AccFrozenPageDTO pageDTO);
+
+   BigDecimal getTotalAccFrozenPage(AccFrozenPageDTO pageDTO);
+
+   List<AccUnFrozenPageVO> queryAccUnFrozenPageList(AccFrozenPageDTO pageDTO);
+
+   List<AccRedRechargePageVO> queryAccRedRechargeList(AccRedRechargePageDTO content);
+
+   AccRedRechargePageVO getTotalAccRedRechargePage(AccRedRechargePageDTO pageDTO);
+
+   List<AccRedCollectVO> listAccRedRechargeCollectPage(AccRedRechargeCollectDTO content);
+
+   AccRedCollectVO queryAccRedRechargeCollectPageSum(AccRedRechargeCollectDTO content);
+
+   AccRechargeDetailPageVO getTotalRechargeAmount(AccRechargeDetailPageDTO rechargeDetailPageDTO);
+   List<AccRechargeDetailPageVO> listAccRechargeDetails(AccRechargeDetailPageDTO rechargeDetailPageDTO);
+   AccWalletRepealV4PageVO getWalletRepealAccTradePageTotal(AccTradeRepealPageDTO pageDTO);
+   List<AccWalletRepealV4PageVO> queryWalletRepealAccTradePageV4(AccTradeRepealPageDTO pageDTO);
+
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccTradeWalletDetailService.java

@@ -4,6 +4,7 @@ package com.bonus.canteen.core.account.v3.service;
 import com.bonus.canteen.core.account.v3.model.AccTradeWalletDetail;
 import com.bonus.canteen.core.account.v3.mq.send.model.RepAccMqDetailModel;
 import com.bonus.canteen.core.account.v3.po.AccTradeWalletPO;
+import com.bonus.canteen.core.account.v3.web.vo.AccDrawWalletDetailVO;
 import com.bonus.canteen.core.account.v3.web.vo.AccOrdTradeVO;
 
 import java.math.BigDecimal;
@@ -32,4 +33,12 @@ public interface AccTradeWalletDetailService {
    AccOrdTradeVO queryAccTradeOrderDetailByLeOrderNo(Long leOrderNo);
 
    Map<Long, List<AccTradeWalletDetail>> queryAccTradeWalletDetailByTradeIdList(List<Long> tradeIdList);
+
+   List<AccTradeWalletDetail> listAccSubsidyExpirationTrade(LocalDateTime startDateTime, LocalDateTime endDateTime);
+
+   void updateExpiredClearTradeStatus(List<Long> collect);
+
+   List<AccTradeWalletDetail> listAccTradeWalletDetailByTradeId(Long tradeId);
+
+   List<AccDrawWalletDetailVO> queryAccTradeByOriginTradeId(List<Long> originTradeIdList);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccTransferService.java

@@ -0,0 +1,27 @@
+package com.bonus.canteen.core.account.v3.service;
+
+import com.bonus.canteen.core.account.v3.web.dto.*;
+import com.bonus.canteen.core.account.v3.web.vo.AccTransferPageSumVO;
+import com.bonus.canteen.core.account.v3.web.vo.AccTransferPageVO;
+import com.bonus.canteen.core.common.page.PageVO;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+public interface AccTransferService {
+   void singleAccTransfer(AccTransferSingleDTO singleDTO);
+
+   void batchAccTransfer(AccTransferBatchDTO batchDTO);
+
+   AccTransferPageSumVO queryAccTransferPage(AccTransferPageDTO pageDTO);
+
+   List<AccTransferPageVO> queryAccTransferList(AccTransferPageDTO pageDTO);
+
+   PageVO<AccTransferPageVO> queryAccTransferPageV4(AccTransferPageDTO pageDTO);
+
+   AccTransferPageVO getAccTransferPageV4Total(AccTransferPageDTO pageDTO);
+
+   AccImportCommonVO<AccTransferImportSucVO, AccImportCommonErrVO> importAccTransferCheck(MultipartFile excel, AccTransferImportModel accTransferImportModel);
+
+   void importAccTransferStart(AccTransferImportDTO content);
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccWalletInfoService.java

@@ -1,5 +1,6 @@
 package com.bonus.canteen.core.account.v3.service;
 
+import com.bonus.canteen.core.account.v3.model.AccWalletInfo;
 import com.bonus.canteen.core.account.v3.po.AccWalletBalanceUpdatePO;
 import com.bonus.canteen.core.account.v3.po.AccWalletInfoRechargePO;
 import com.bonus.canteen.core.account.v3.web.vo.AccUpdateWalletBalanceVO;
@@ -7,14 +8,19 @@ import com.bonus.canteen.core.account.v3.web.vo.AccWalletInfoVO;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 public interface AccWalletInfoService {
    List<AccWalletInfoVO> findAccWalletInfoVOListByCustId(Long custId);
+   void insertBatch(List<AccWalletInfo> accWalletInfos);
    BigDecimal calculateSubsidyExpirationAmount(Long custId);
    void updateAccWalletInfoForUse(Long custId, Integer walletId, BigDecimal amount);
    AccUpdateWalletBalanceVO updateAccWalletBalance(AccWalletBalanceUpdatePO updatePo);
 
    AccUpdateWalletBalanceVO getAccWalletBalanceByCustId(Long custId);
-
    void updateAccWalletInfoForRecharge(AccWalletInfoRechargePO rechargePo);
+   Map<Long, List<AccWalletInfoVO>> queryAccWalletInfoVOMapByCustIdList(List<Long> custIdList);
+   void updateLimitBalance(Long custId, List<Long> custIdList, Integer walletId, BigDecimal limitBalance);
+
+   BigDecimal getAccWalletFrozenTotal(Long custId);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccWalletService.java

@@ -1,8 +1,17 @@
 package com.bonus.canteen.core.account.v3.service;
 
 import com.bonus.canteen.core.account.v3.web.dto.AccRechargeBackDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccRechargeDetailPageDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccTradeRepealPageDTO;
+import com.bonus.canteen.core.account.v3.web.vo.AccRechargeDetailPageVO;
+import com.bonus.canteen.core.account.v4.vo.AccWalletRepealV4PageVO;
+import com.bonus.canteen.core.common.page.PageVO;
 
 public interface AccWalletService {
 
    void accRechargeResultHandlerV2(AccRechargeBackDTO accRechargeBackDTO);
+   AccRechargeDetailPageVO getAccRechargeDetailsV4Total(AccRechargeDetailPageDTO rechargeDetailPageDTO);
+   PageVO<AccRechargeDetailPageVO> queryAccRechargeDetailsV4(AccRechargeDetailPageDTO rechargeDetailPageDTO);
+   AccWalletRepealV4PageVO getWalletRepealAccTradePageV4Total(AccTradeRepealPageDTO pageDTO);
+   PageVO<AccWalletRepealV4PageVO> queryWalletRepealAccTradePageV4(AccTradeRepealPageDTO pageDTO);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/service/AccWithDrawService.java

@@ -0,0 +1,39 @@
+package com.bonus.canteen.core.account.v3.service;
+
+
+import com.bonus.canteen.core.account.v3.web.dto.AccWithDrawBatchDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccWithDrawSingleDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccWithdrawDetailPageDTO;
+import com.bonus.canteen.core.account.v3.web.dto.AccWithdrawPageSumDTO;
+import com.bonus.canteen.core.account.v3.web.vo.*;
+import com.bonus.canteen.core.common.page.PageVO;
+
+import java.util.List;
+
+public interface AccWithDrawService {
+   void updateSingleAccWithDraw(AccWithDrawSingleDTO content);
+
+   void updateBatchAccWithDraw(AccWithDrawBatchDTO content);
+
+   AccWithdrawDetailPageSumVO queryAccWithdrawPageDetails(AccWithdrawDetailPageDTO content);
+
+   PageVO<AccWithdrawDetailPageVO> queryAccWithdrawDetailPageV4(AccWithdrawDetailPageDTO content);
+
+   AccWithdrawDetailPageVO getAccWithdrawDetailPageV4Total(AccWithdrawDetailPageDTO content);
+
+   AccWithdrawTradeTypePageSumVO queryTradeTypeAccWithdrawSumPage(AccWithdrawPageSumDTO content);
+
+   PageVO<AccWithdrawTradeTypePageVO> queryTradeTypeWithdrawSummaryPageV4(AccWithdrawPageSumDTO content);
+
+   AccWithdrawTradeTypePageVO getTradeTypeWithdrawSummaryPageV4Total(AccWithdrawPageSumDTO content);
+
+   List<AccWithdrawTradeTypePageVO> queryTradeTypeAccWithdrawSumList(AccWithdrawPageSumDTO content);
+
+   AccWithdrawPageSumVO queryAccWithdrawPageSum(AccWithdrawPageSumDTO content);
+
+   List<AccWithdrawPageVO> queryAccWithdrawSum(AccWithdrawPageSumDTO content);
+
+   PageVO<AccWithdrawPageVO> queryWithdrawSummaryPageV4(AccWithdrawPageSumDTO content);
+
+   AccWithdrawPageVO getWithdrawSummaryPageV4Total(AccWithdrawPageSumDTO content);
+}