Merge remote-tracking branch 'origin/bugfix/2023-06-07' into developer

ded63d7a · jinxin · 81d05d97 · 5b3b7b72 · ded63d7a
Commit ded63d7a authored Jun 09, 2023 by jinxin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

WxEnterpriseActiveDataServiceImpl.java ...rvice/service/impl/WxEnterpriseActiveDataServiceImpl.java +2 -1

No files found.
--- a/haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseActiveDataServiceImpl.java
+++ b/haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseActiveDataServiceImpl.java
@@ -70,7 +70,8 @@ public class WxEnterpriseActiveDataServiceImpl implements WxEnterpriseActiveData
                    transfer += Integer.valueOf(String.valueOf(map.get("num")));
                    break;
                case 5:
-                    //已合并的激活码，总数会减少
+                    //已合并的激活码
+                    purchased += Integer.valueOf(String.valueOf(map.get("num")));
                    merged += Integer.valueOf(String.valueOf(map.get("num")));
                    break;
                default: