From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev

---
 service-fee/src/main/java/com/java110/fee/cmd/feePrintPage/UpdateFeePrintPageCmd.java |   40 +++++++++++++++++++++++++---------------
 1 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/feePrintPage/UpdateFeePrintPageCmd.java
similarity index 63%
copy from service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java
copy to service-fee/src/main/java/com/java110/fee/cmd/feePrintPage/UpdateFeePrintPageCmd.java
index c06b8f0..f66e610 100644
--- a/service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/feePrintPage/UpdateFeePrintPageCmd.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.community.cmd.room;
+package com.java110.fee.cmd.feePrintPage;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
@@ -21,40 +21,40 @@
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.community.IRoomV1InnerServiceSMO;
-import com.java110.po.room.RoomPo;
+import com.java110.intf.fee.IFeePrintPageV1InnerServiceSMO;
+import com.java110.po.feePrintPage.FeePrintPagePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 
 
 /**
  * 绫昏〃杩帮細鏇存柊
- * 鏈嶅姟缂栫爜锛歳oom.updateRoom
- * 璇锋眰璺姴锛�/app/room.UpdateRoom
- * add by 鍚村鏂� at 2021-09-14 14:28:56 mail: 928255095@qq.com
+ * 鏈嶅姟缂栫爜锛歠eePrintPage.updateFeePrintPage
+ * 璇锋眰璺姴锛�/app/feePrintPage.UpdateFeePrintPage
+ * add by 鍚村鏂� at 2021-09-16 22:26:04 mail: 928255095@qq.com
  * open source address: https://gitee.com/wuxw7/MicroCommunity
  * 瀹樼綉锛歨ttp://www.homecommunity.cn
  * 娓╅Θ鎻愮ず锛氬鏋滄偍瀵规鏂囦欢杩涜淇敼 璇蜂笉瑕佸垹闄ゅ師鏈変綔鑰呭強娉ㄩ噴淇℃伅锛岃琛ュ厖鎮ㄧ殑 淇敼鐨勫師鍥犱互鍙婅仈绯婚偖绠卞涓�
  * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
  */
-@Java110Cmd(serviceCode = "room.UpdateRoom")
-public class UpdateRoomCmd extends AbstractServiceCmdListener {
+@Java110Cmd(serviceCode = "feePrintPage.updateFeePrintPage")
+public class UpdateFeePrintPageCmd extends AbstractServiceCmdListener {
 
-    private static Logger logger = LoggerFactory.getLogger(UpdateRoomCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(UpdateFeePrintPageCmd.class);
 
 
     @Autowired
-    private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
+    private IFeePrintPageV1InnerServiceSMO feePrintPageV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "roomId", "roomId涓嶈兘涓虹┖");
+        Assert.hasKeyAndValue(reqJson, "pageId", "pageId涓嶈兘涓虹┖");
         Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
 
     }
@@ -63,13 +63,23 @@
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-        RoomPo roomPo = BeanConvertUtil.covertBean(reqJson, RoomPo.class);
-        int flag = roomV1InnerServiceSMOImpl.updateRoom(roomPo);
+        FeePrintPagePo feePrintPagePo = BeanConvertUtil.covertBean(reqJson, FeePrintPagePo.class);
+        //灏嗘墍鏈夌殑鍒蜂负 F
+        if("T".equals(feePrintPagePo.getState())){
+            FeePrintPagePo newFeePrintPagePo = new FeePrintPagePo();
+            newFeePrintPagePo.setCommunityId(feePrintPagePo.getCommunityId());
+            newFeePrintPagePo.setState("F");
+            feePrintPageV1InnerServiceSMOImpl.updateFeePrintPage(newFeePrintPagePo);
+        }
+
+        //灏嗗叾浠栨ā鏉垮埛涓篎
+        int flag = feePrintPageV1InnerServiceSMOImpl.updateFeePrintPage(feePrintPagePo);
 
         if (flag < 1) {
             throw new CmdException("鏇存柊鏁版嵁澶辫触");
         }
 
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

--
Gitblit v1.8.0