From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-fee/src/main/java/com/java110/fee/smo/impl/FeeReceiptInnerServiceSMOImpl.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/smo/impl/FeeReceiptInnerServiceSMOImpl.java b/service-fee/src/main/java/com/java110/fee/smo/impl/FeeReceiptInnerServiceSMOImpl.java
index 3e85597..060664d 100755
--- a/service-fee/src/main/java/com/java110/fee/smo/impl/FeeReceiptInnerServiceSMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/smo/impl/FeeReceiptInnerServiceSMOImpl.java
@@ -2,6 +2,7 @@
 
 
 import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.PageDto;
 import com.java110.dto.community.CommunitySettingDto;
 import com.java110.dto.fee.FeeReceiptDto;
@@ -144,14 +145,14 @@
                 communitySettingDtos = communitySettingInnerServiceSMOImpl.queryCommunitySettings(communitySettingDto);
             }
 
-            preReceiptCode = communitySettingDtos.get(0).getSettingValue();
+            preReceiptCode = communitySettingDtos.get(0).getSettingValue().trim();
             if (!StringUtil.isNumber(preReceiptCode)) {
                 return startCode + preReceiptCode;
             }
 
-            if(preReceiptCode.length() > 24){
+            if (preReceiptCode.length() > 24) {
                 receiptCode = String.format("%024d", (Long.parseLong(preReceiptCode) + 1));
-            }else{
+            } else {
                 receiptCode = String.format("%0" + preReceiptCode.length() + "d", (Long.parseLong(preReceiptCode) + 1));
             }
 
@@ -168,6 +169,15 @@
     }
 
     private void saveReceiptCode(String communityId) {
+        CommunitySettingPo communitySettingPo = new CommunitySettingPo();
+        communitySettingPo.setCommunityId(communityId);
+        communitySettingPo.setCsId(GenerateCodeFactory.getGeneratorId("10"));
+        communitySettingPo.setSettingType(CommunitySettingDto.SETTING_TYPE_FEE);
+        communitySettingPo.setSettingKey(CommunitySettingDto.SETTING_KEY_RECEIPT_CODE);
+        communitySettingPo.setSettingValue("001");
+        communitySettingPo.setSettingName("鏀舵嵁寮�濮嬬紪鍙�");
+        communitySettingPo.setRemark("绯荤粺鑷姩鐢熸垚");
+        communitySettingInnerServiceSMOImpl.saveCommunitySetting(communitySettingPo);
     }
 
     public IFeeReceiptServiceDao getFeeReceiptServiceDaoImpl() {

--
Gitblit v1.8.0