java110 лет назад: 4
Родитель
Сommit
46f7cd0956
31 измененных файлов с 1457 добавлено и 1225 удалено
  1. 9 0
      java110-bean/src/main/java/com/java110/po/tempCarFeeConfig/TempCarFeeConfigPo.java
  2. 106 0
      java110-db/src/main/resources/mapper/fee/TempCarFeeConfigAttrV1ServiceDaoImplMapper.xml
  3. 149 0
      java110-db/src/main/resources/mapper/fee/TempCarFeeConfigV1ServiceDaoImplMapper.xml
  4. 68 0
      java110-interface/src/main/java/com/java110/intf/fee/ITempCarFeeConfigAttrV1InnerServiceSMO.java
  5. 68 0
      java110-interface/src/main/java/com/java110/intf/fee/ITempCarFeeConfigV1InnerServiceSMO.java
  6. 0 49
      service-api/src/main/java/com/java110/api/listener/fee/DeleteTempCarFeeConfigAttrListener.java
  7. 0 73
      service-api/src/main/java/com/java110/api/listener/fee/DeleteTempCarFeeConfigListener.java
  8. 0 91
      service-api/src/main/java/com/java110/api/listener/fee/FinishFeeListener.java
  9. 0 179
      service-api/src/main/java/com/java110/api/listener/fee/PayFeeConfirmListener.java
  10. 0 411
      service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java
  11. 0 49
      service-api/src/main/java/com/java110/api/listener/ownerCarAttr/DeleteOwnerCarAttrListener.java
  12. 0 82
      service-api/src/main/java/com/java110/api/listener/ownerCarAttr/ListOwnerCarAttrsListener.java
  13. 0 47
      service-api/src/main/java/com/java110/api/listener/ownerCarAttr/SaveOwnerCarAttrListener.java
  14. 0 47
      service-api/src/main/java/com/java110/api/listener/ownerCarAttr/UpdateOwnerCarAttrListener.java
  15. 25 55
      service-api/src/main/java/com/java110/api/listener/fee/DeleteFeeListener.java
  16. 63 0
      service-fee/src/main/java/com/java110/fee/cmd/fee/DeleteTempCarFeeConfigCmd.java
  17. 60 0
      service-fee/src/main/java/com/java110/fee/cmd/fee/FinishFeeCmd.java
  18. 12 31
      service-api/src/main/java/com/java110/api/listener/fee/ListBillOweFeeListener.java
  19. 16 52
      service-api/src/main/java/com/java110/api/listener/fee/ListOwnerOweFeeListener.java
  20. 15 57
      service-api/src/main/java/com/java110/api/listener/fee/ListParkingSpacesWhereFeeSetListener.java
  21. 71 0
      service-fee/src/main/java/com/java110/fee/cmd/tempCarFeeConfigAttr/DeleteTempCarFeeConfigAttrCmd.java
  22. 84 0
      service-fee/src/main/java/com/java110/fee/cmd/tempCarFeeConfigAttr/ListTempCarFeeConfigAttrCmd.java
  23. 78 0
      service-fee/src/main/java/com/java110/fee/cmd/tempCarFeeConfigAttr/SaveTempCarFeeConfigAttrCmd.java
  24. 75 0
      service-fee/src/main/java/com/java110/fee/cmd/tempCarFeeConfigAttr/UpdateTempCarFeeConfigAttrCmd.java
  25. 77 0
      service-fee/src/main/java/com/java110/fee/dao/ITempCarFeeConfigAttrV1ServiceDao.java
  26. 77 0
      service-fee/src/main/java/com/java110/fee/dao/ITempCarFeeConfigV1ServiceDao.java
  27. 112 0
      service-fee/src/main/java/com/java110/fee/dao/impl/TempCarFeeConfigAttrV1ServiceDaoImpl.java
  28. 112 0
      service-fee/src/main/java/com/java110/fee/dao/impl/TempCarFeeConfigV1ServiceDaoImpl.java
  29. 89 0
      service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeConfigAttrV1InnerServiceSMOImpl.java
  30. 89 0
      service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeConfigV1InnerServiceSMOImpl.java
  31. 2 2
      service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCarCmd.java

+ 9 - 0
java110-bean/src/main/java/com/java110/po/tempCarFeeConfig/TempCarFeeConfigPo.java

@@ -14,6 +14,7 @@ public class TempCarFeeConfigPo implements Serializable {
     private String ruleId;
     private String communityId;
     private String feeConfigId;
+    private String statusCd;
 
     public String getCarType() {
         return carType;
@@ -94,4 +95,12 @@ public class TempCarFeeConfigPo implements Serializable {
     public void setFeeConfigId(String feeConfigId) {
         this.feeConfigId = feeConfigId;
     }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

+ 106 - 0
java110-db/src/main/resources/mapper/fee/TempCarFeeConfigAttrV1ServiceDaoImplMapper.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="tempCarFeeConfigAttrV1ServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存临时费用配置信息 add by wuxw 2018-07-03 -->
+    <insert id="saveTempCarFeeConfigAttrInfo" parameterType="Map">
+        insert into temp_car_fee_config_attr(
+attr_id,config_id,spec_cd,community_id,value
+) values (
+#{attrId},#{configId},#{specCd},#{communityId},#{value}
+)
+    </insert>
+
+
+
+    <!-- 查询临时费用配置信息 add by wuxw 2018-07-03 -->
+    <select id="getTempCarFeeConfigAttrInfo" parameterType="Map" resultType="Map">
+        select  t.attr_id,t.attr_id attrId,t.config_id,t.config_id configId,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.value 
+from temp_car_fee_config_attr t 
+where 1 =1 
+<if test="attrId !=null and attrId != ''">
+   and t.attr_id= #{attrId}
+</if> 
+<if test="configId !=null and configId != ''">
+   and t.config_id= #{configId}
+</if> 
+<if test="specCd !=null and specCd != ''">
+   and t.spec_cd= #{specCd}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="value !=null and value != ''">
+   and t.value= #{value}
+</if> 
+order by t.create_time desc
+<if test="page != -1 and page != null ">
+   limit #{page}, #{row}
+</if> 
+
+    </select>
+
+
+
+
+    <!-- 修改临时费用配置信息 add by wuxw 2018-07-03 -->
+    <update id="updateTempCarFeeConfigAttrInfo" parameterType="Map">
+        update  temp_car_fee_config_attr t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="configId !=null and configId != ''">
+, t.config_id= #{configId}
+</if> 
+<if test="specCd !=null and specCd != ''">
+, t.spec_cd= #{specCd}
+</if> 
+<if test="communityId !=null and communityId != ''">
+, t.community_id= #{communityId}
+</if> 
+<if test="value !=null and value != ''">
+, t.value= #{value}
+</if> 
+ where 1=1 <if test="attrId !=null and attrId != ''">
+and t.attr_id= #{attrId}
+</if> 
+
+    </update>
+
+    <!-- 查询临时费用配置数量 add by wuxw 2018-07-03 -->
+     <select id="queryTempCarFeeConfigAttrsCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from temp_car_fee_config_attr t 
+where 1 =1 
+<if test="attrId !=null and attrId != ''">
+   and t.attr_id= #{attrId}
+</if> 
+<if test="configId !=null and configId != ''">
+   and t.config_id= #{configId}
+</if> 
+<if test="specCd !=null and specCd != ''">
+   and t.spec_cd= #{specCd}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="value !=null and value != ''">
+   and t.value= #{value}
+</if> 
+
+
+     </select>
+
+</mapper>

+ 149 - 0
java110-db/src/main/resources/mapper/fee/TempCarFeeConfigV1ServiceDaoImplMapper.xml

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="tempCarFeeConfigV1ServiceDaoImpl">
+
+
+    <!-- 保存临时费用配置信息 add by wuxw 2018-07-03 -->
+    <insert id="saveTempCarFeeConfigInfo" parameterType="Map">
+        insert into temp_car_fee_config(
+        car_type,config_id,fee_name,pa_id,area_num,start_time,end_time,rule_id,community_id,fee_config_id
+        ) values (
+        #{carType},#{configId},#{feeName},#{paId},#{areaNum},#{startTime},#{endTime},#{ruleId},#{communityId},#{feeConfigId}
+        )
+    </insert>
+
+
+    <!-- 查询临时费用配置信息 add by wuxw 2018-07-03 -->
+    <select id="getTempCarFeeConfigInfo" parameterType="Map" resultType="Map">
+        select t.car_type,t.car_type carType,t.config_id,t.config_id configId,t.fee_name,t.fee_name
+        feeName,t.pa_id,t.pa_id paId,t.area_num,t.area_num areaNum,t.start_time,t.start_time
+        startTime,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.rule_id,t.rule_id
+        ruleId,t.community_id,t.community_id communityId,t.fee_config_id,t.fee_config_id feeConfigId
+        from temp_car_fee_config t
+        where 1 =1
+        <if test="carType !=null and carType != ''">
+            and t.car_type= #{carType}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            and t.fee_name= #{feeName}
+        </if>
+        <if test="paId !=null and paId != ''">
+            and t.pa_id= #{paId}
+        </if>
+        <if test="areaNum !=null and areaNum != ''">
+            and t.area_num= #{areaNum}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            and t.rule_id= #{ruleId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="feeConfigId !=null and feeConfigId != ''">
+            and t.fee_config_id= #{feeConfigId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
+
+
+    <!-- 修改临时费用配置信息 add by wuxw 2018-07-03 -->
+    <update id="updateTempCarFeeConfigInfo" parameterType="Map">
+        update temp_car_fee_config t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="carType !=null and carType != ''">
+            , t.car_type= #{carType}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            , t.fee_name= #{feeName}
+        </if>
+        <if test="paId !=null and paId != ''">
+            , t.pa_id= #{paId}
+        </if>
+        <if test="areaNum !=null and areaNum != ''">
+            , t.area_num= #{areaNum}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            , t.start_time= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            , t.end_time= #{endTime}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            , t.rule_id= #{ruleId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="feeConfigId !=null and feeConfigId != ''">
+            , t.fee_config_id= #{feeConfigId}
+        </if>
+        where 1=1
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+
+    </update>
+
+    <!-- 查询临时费用配置数量 add by wuxw 2018-07-03 -->
+    <select id="queryTempCarFeeConfigsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from temp_car_fee_config t
+        where 1 =1
+        <if test="carType !=null and carType != ''">
+            and t.car_type= #{carType}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            and t.fee_name= #{feeName}
+        </if>
+        <if test="paId !=null and paId != ''">
+            and t.pa_id= #{paId}
+        </if>
+        <if test="areaNum !=null and areaNum != ''">
+            and t.area_num= #{areaNum}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            and t.rule_id= #{ruleId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="feeConfigId !=null and feeConfigId != ''">
+            and t.fee_config_id= #{feeConfigId}
+        </if>
+
+
+    </select>
+
+</mapper>

+ 68 - 0
java110-interface/src/main/java/com/java110/intf/fee/ITempCarFeeConfigAttrV1InnerServiceSMO.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.intf.fee;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.tempCarFeeConfigAttr.TempCarFeeConfigAttrDto;
+import com.java110.po.tempCarFeeConfigAttr.TempCarFeeConfigAttrPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * 类表述: 服务之前调用的接口类,不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-06-27 13:39:52 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@FeignClient(name = "fee-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/tempCarFeeConfigAttrV1Api")
+public interface ITempCarFeeConfigAttrV1InnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveTempCarFeeConfigAttr", method = RequestMethod.POST)
+    public int saveTempCarFeeConfigAttr(@RequestBody  TempCarFeeConfigAttrPo tempCarFeeConfigAttrPo);
+
+    @RequestMapping(value = "/updateTempCarFeeConfigAttr", method = RequestMethod.POST)
+    public int updateTempCarFeeConfigAttr(@RequestBody  TempCarFeeConfigAttrPo tempCarFeeConfigAttrPo);
+
+    @RequestMapping(value = "/deleteTempCarFeeConfigAttr", method = RequestMethod.POST)
+    public int deleteTempCarFeeConfigAttr(@RequestBody  TempCarFeeConfigAttrPo tempCarFeeConfigAttrPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param tempCarFeeConfigAttrDto 数据对象分享
+     * @return TempCarFeeConfigAttrDto 对象数据
+     */
+    @RequestMapping(value = "/queryTempCarFeeConfigAttrs", method = RequestMethod.POST)
+    List<TempCarFeeConfigAttrDto> queryTempCarFeeConfigAttrs(@RequestBody TempCarFeeConfigAttrDto tempCarFeeConfigAttrDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param tempCarFeeConfigAttrDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryTempCarFeeConfigAttrsCount", method = RequestMethod.POST)
+    int queryTempCarFeeConfigAttrsCount(@RequestBody TempCarFeeConfigAttrDto tempCarFeeConfigAttrDto);
+}

+ 68 - 0
java110-interface/src/main/java/com/java110/intf/fee/ITempCarFeeConfigV1InnerServiceSMO.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.intf.fee;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.tempCarFeeConfig.TempCarFeeConfigDto;
+import com.java110.po.tempCarFeeConfig.TempCarFeeConfigPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * 类表述: 服务之前调用的接口类,不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-06-27 11:41:00 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@FeignClient(name = "fee-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/tempCarFeeConfigV1Api")
+public interface ITempCarFeeConfigV1InnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveTempCarFeeConfig", method = RequestMethod.POST)
+    public int saveTempCarFeeConfig(@RequestBody  TempCarFeeConfigPo tempCarFeeConfigPo);
+
+    @RequestMapping(value = "/updateTempCarFeeConfig", method = RequestMethod.POST)
+    public int updateTempCarFeeConfig(@RequestBody  TempCarFeeConfigPo tempCarFeeConfigPo);
+
+    @RequestMapping(value = "/deleteTempCarFeeConfig", method = RequestMethod.POST)
+    public int deleteTempCarFeeConfig(@RequestBody  TempCarFeeConfigPo tempCarFeeConfigPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param tempCarFeeConfigDto 数据对象分享
+     * @return TempCarFeeConfigDto 对象数据
+     */
+    @RequestMapping(value = "/queryTempCarFeeConfigs", method = RequestMethod.POST)
+    List<TempCarFeeConfigDto> queryTempCarFeeConfigs(@RequestBody TempCarFeeConfigDto tempCarFeeConfigDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param tempCarFeeConfigDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryTempCarFeeConfigsCount", method = RequestMethod.POST)
+    int queryTempCarFeeConfigsCount(@RequestBody TempCarFeeConfigDto tempCarFeeConfigDto);
+}

+ 0 - 49
service-api/src/main/java/com/java110/api/listener/fee/DeleteTempCarFeeConfigAttrListener.java

@@ -1,49 +0,0 @@
-package com.java110.api.listener.fee;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.tempCarFeeConfigAttr.ITempCarFeeConfigAttrBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeTempCarFeeConfigAttrConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("deleteTempCarFeeConfigAttrListener")
-public class DeleteTempCarFeeConfigAttrListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private ITempCarFeeConfigAttrBMO tempCarFeeConfigAttrBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        tempCarFeeConfigAttrBMOImpl.deleteTempCarFeeConfigAttr(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeTempCarFeeConfigAttrConstant.DELETE_TEMPCARFEECONFIGATTR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-}

+ 0 - 73
service-api/src/main/java/com/java110/api/listener/fee/DeleteTempCarFeeConfigListener.java

@@ -1,73 +0,0 @@
-package com.java110.api.listener.fee;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.tempCarFeeConfig.ITempCarFeeConfigBMO;
-import com.java110.api.bmo.tempCarFeeConfigAttr.ITempCarFeeConfigAttrBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeTempCarFeeConfigConstant;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.StringUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("deleteTempCarFeeConfigListener")
-public class DeleteTempCarFeeConfigListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private ITempCarFeeConfigBMO tempCarFeeConfigBMOImpl;
-
-    @Autowired
-    private ITempCarFeeConfigAttrBMO tempCarFeeConfigAttrBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "configId", "configId不能为空");
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        tempCarFeeConfigBMOImpl.deleteTempCarFeeConfig(reqJson, context);
-
-        JSONArray attrs = reqJson.getJSONArray("tempCarFeeConfigAttrs");
-        if (attrs == null || attrs.size() < 1) {
-            return;
-        }
-
-
-        JSONObject attr = null;
-        for (int attrIndex = 0; attrIndex < attrs.size(); attrIndex++) {
-            attr = attrs.getJSONObject(attrIndex);
-            attr.put("ruleId", reqJson.getString("ruleId"));
-            attr.put("communityId", reqJson.getString("communityId"));
-            if (!attr.containsKey("attrId") || attr.getString("attrId").startsWith("-") || StringUtil.isEmpty(attr.getString("attrId"))) {
-                continue;
-            }
-            tempCarFeeConfigAttrBMOImpl.deleteTempCarFeeConfigAttr(attr, context);
-        }
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeTempCarFeeConfigConstant.DELETE_TEMPCARFEECONFIG;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-}

+ 0 - 91
service-api/src/main/java/com/java110/api/listener/fee/FinishFeeListener.java

@@ -1,91 +0,0 @@
-package com.java110.api.listener.fee;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.fee.IFeeBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.dto.fee.FeeDto;
-import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.fee.IFeeInnerServiceSMO;
-import com.java110.po.fee.PayFeePo;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.ServiceCodeConstant;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-import java.util.List;
-
-/**
- * @ClassName SaveRoomCreateFeeListener
- * @Description TODO 变更费用
- * @Author wuxw
- * @Date 2020/1/31 15:57
- * @Version 1.0
- * add by wuxw 2020/1/31
- **/
-@Java110Listener("finishFeeListener")
-public class FinishFeeListener extends AbstractServiceApiPlusListener {
-    private static Logger logger = LoggerFactory.getLogger(FinishFeeListener.class);
-    @Autowired
-    private IFeeBMO feeBMOImpl;
-
-    private static final int DEFAULT_ADD_FEE_COUNT = 200;
-
-    @Autowired
-    private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
-
-    @Autowired
-    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_FINISH_FEE;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        // super.validatePageInfo(pd);
-        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
-        Assert.hasKeyAndValue(reqJson, "feeId", "未包含feeId");
-
-        FeeDto feeDto = new FeeDto();
-        feeDto.setCommunityId(reqJson.getString("communityId"));
-        feeDto.setFeeId(reqJson.getString("feeId"));
-
-        List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
-
-        Assert.listOnlyOne(feeDtos, "未查询到费用信息 或查询到多条" + reqJson);
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-        PayFeePo payFeePo = BeanConvertUtil.covertBean(reqJson, PayFeePo.class);
-        payFeePo.setState(FeeDto.STATE_FINISH);
-        super.update(context, payFeePo, BusinessTypeConstant.BUSINESS_TYPE_ONLY_UPDATE_FEE_INFO);
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-    public IRoomInnerServiceSMO getRoomInnerServiceSMOImpl() {
-        return roomInnerServiceSMOImpl;
-    }
-
-    public void setRoomInnerServiceSMOImpl(IRoomInnerServiceSMO roomInnerServiceSMOImpl) {
-        this.roomInnerServiceSMOImpl = roomInnerServiceSMOImpl;
-    }
-}

+ 0 - 179
service-api/src/main/java/com/java110/api/listener/fee/PayFeeConfirmListener.java

@@ -1,179 +0,0 @@
-package com.java110.api.listener.fee;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.fee.IFeeBMO;
-import com.java110.api.listener.AbstractServiceApiDataFlowListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.dto.fee.FeeAttrDto;
-import com.java110.dto.fee.FeeDto;
-import com.java110.dto.order.BusinessDto;
-import com.java110.dto.repair.RepairDto;
-import com.java110.entity.center.AppService;
-import com.java110.entity.order.Orders;
-import com.java110.intf.fee.*;
-import com.java110.intf.order.IOrderInnerServiceSMO;
-import com.java110.po.owner.RepairPoolPo;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ServiceCodeConstant;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName PayFeeListener
- * @Description TODO 交费通知侦听
- * @Author wuxw
- * @Date 2019/6/3 13:46
- * @Version 1.0
- * add by wuxw 2019/6/3
- **/
-@Java110Listener("PayFeeConfirmListener")
-public class PayFeeConfirmListener extends AbstractServiceApiDataFlowListener {
-
-    private static Logger logger = LoggerFactory.getLogger(PayFeeConfirmListener.class);
-
-    @Autowired
-    private IFeeBMO feeBMOImpl;
-
-    @Autowired
-    private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
-
-    @Autowired
-    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
-
-    @Autowired
-    private IOrderInnerServiceSMO orderInnerServiceSMOImpl;
-
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_PAY_CONFIRM_PRE;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public void soService(ServiceDataFlowEvent event) {
-
-        logger.debug("ServiceDataFlowEvent : {}", event);
-
-        DataFlowContext dataFlowContext = event.getDataFlowContext();
-        AppService service = event.getAppService();
-
-        String paramIn = dataFlowContext.getReqData();
-
-        //校验数据
-        validate(paramIn);
-        JSONObject paramObj = JSONObject.parseObject(paramIn);
-
-        HttpHeaders header = new HttpHeaders();
-        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
-        JSONArray businesses = new JSONArray();
-        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.O_ID, paramObj.getString("oId"));
-        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.ORDER_PROCESS, Orders.ORDER_PROCESS_ORDER_CONFIRM_SUBMIT);
-        ResponseEntity<String> responseEntity = feeBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
-
-        if (responseEntity.getStatusCode() != HttpStatus.OK) {
-            dataFlowContext.setResponseEntity(responseEntity);
-            return;
-        }
-
-        //根据oId 查询 bId;
-        BusinessDto businessDto = new BusinessDto();
-        businessDto.setoId(paramObj.getString("oId"));
-        businessDto.setBusinessTypeCd("600100040001");
-        List<BusinessDto> businessDtos = orderInnerServiceSMOImpl.querySameOrderBusiness(businessDto);
-        if (businessDtos == null || businessDtos.size() < 1) {
-            dataFlowContext.setResponseEntity(responseEntity);
-            return;
-        }
-
-        FeeDto feeDto = new FeeDto();
-        feeDto.setbId(businessDtos.get(0).getbId());
-
-        List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryBusinessFees(feeDto);
-
-        if (feeDtos == null || feeDtos.size() < 1) {
-            dataFlowContext.setResponseEntity(responseEntity);
-            return;
-        }
-
-
-        businesses = new JSONArray();
-        //判断是否有派单属性ID
-        FeeAttrDto feeAttrDto = new FeeAttrDto();
-        feeAttrDto.setCommunityId(feeDtos.get(0).getCommunityId());
-        feeAttrDto.setFeeId(feeDtos.get(0).getFeeId());
-        feeAttrDto.setSpecCd(FeeAttrDto.SPEC_CD_REPAIR);
-        List<FeeAttrDto> feeAttrDtos = feeAttrInnerServiceSMOImpl.queryFeeAttrs(feeAttrDto);
-        //修改 派单状态
-        if (feeAttrDtos != null && feeAttrDtos.size() > 0) {
-            JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
-            business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR);
-            business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
-            business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
-            RepairPoolPo repairPoolPo = new RepairPoolPo();
-            repairPoolPo.setRepairId(feeAttrDtos.get(0).getValue());
-            repairPoolPo.setCommunityId(paramObj.getString("communityId"));
-            repairPoolPo.setState(RepairDto.STATE_APPRAISE);
-            business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(RepairPoolPo.class.getSimpleName(), BeanConvertUtil.beanCovertMap(repairPoolPo));
-            businesses.add(business);
-            dataFlowContext.getRequestCurrentHeaders().remove(CommonConstant.ORDER_PROCESS);
-            dataFlowContext.getRequestCurrentHeaders().remove(CommonConstant.O_ID);
-            feeBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
-        }
-
-        dataFlowContext.setResponseEntity(responseEntity);
-
-
-    }
-
-
-    /**
-     * 刷入order信息
-     *
-     * @param orders  订单信息
-     * @param headers 头部信息
-     */
-    protected void freshOrderProtocol(JSONObject orders, Map<String, String> headers) {
-        feeBMOImpl.freshOrderProtocol(orders, headers);
-        orders.put("orderProcess", Orders.ORDER_PROCESS_ORDER_CONFIRM_SUBMIT);
-        orders.put("oId", headers.get("oId"));
-    }
-
-    /**
-     * 数据校验
-     *
-     * @param paramIn "communityId": "7020181217000001",
-     *                "memberId": "3456789",
-     *                "memberTypeCd": "390001200001"
-     */
-    private void validate(String paramIn) {
-        Assert.jsonObjectHaveKey(paramIn, "oId", "请求报文中未包含订单信息");
-        JSONObject paramInObj = JSONObject.parseObject(paramIn);
-        Assert.hasLength(paramInObj.getString("oId"), "订单信息不能为空");
-
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-}

+ 0 - 411
service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java

@@ -1,411 +0,0 @@
-package com.java110.api.listener.fee;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.fee.IFeeBMO;
-import com.java110.api.bmo.payFeeDetailDiscount.IPayFeeDetailDiscountBMO;
-import com.java110.api.listener.AbstractServiceApiDataFlowListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.core.log.LoggerFactory;
-import com.java110.dto.app.AppDto;
-import com.java110.dto.community.CommunityDto;
-import com.java110.dto.fee.FeeAttrDto;
-import com.java110.dto.fee.FeeDetailDto;
-import com.java110.dto.fee.FeeDto;
-import com.java110.dto.feeDiscount.ComputeDiscountDto;
-import com.java110.dto.owner.OwnerCarDto;
-import com.java110.dto.repair.RepairDto;
-import com.java110.dto.repair.RepairUserDto;
-import com.java110.entity.center.AppService;
-import com.java110.entity.order.Orders;
-import com.java110.intf.community.ICommunityV1InnerServiceSMO;
-import com.java110.intf.community.IRepairUserInnerServiceSMO;
-import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.fee.*;
-import com.java110.intf.user.IOwnerCarInnerServiceSMO;
-import com.java110.po.applyRoomDiscount.ApplyRoomDiscountPo;
-import com.java110.po.car.OwnerCarPo;
-import com.java110.po.owner.RepairPoolPo;
-import com.java110.po.owner.RepairUserPo;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ServiceCodeConstant;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @ClassName PayFeeListener
- * @Description TODO 预交费侦听
- * @Author wuxw
- * @Date 2019/6/3 13:46
- * @Version 1.0
- * add by wuxw 2019/6/3
- **/
-@Java110Listener("payFeePreListener")
-public class PayFeePreListener extends AbstractServiceApiDataFlowListener {
-
-    private static Logger logger = LoggerFactory.getLogger(PayFeePreListener.class);
-
-    @Autowired
-    private IFeeBMO feeBMOImpl;
-
-    @Autowired
-    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
-
-    @Autowired
-    private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
-
-    @Autowired
-    private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
-
-    @Autowired
-    private IFeeDiscountInnerServiceSMO feeDiscountInnerServiceSMOImpl;
-
-    @Autowired
-    private IPayFeeDetailDiscountBMO payFeeDetailDiscountBMOImpl;
-
-    @Autowired
-    private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
-
-    @Autowired
-    private IRepairUserInnerServiceSMO repairUserInnerServiceSMO;
-
-    @Autowired
-    private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
-
-    @Autowired
-    private IApplyRoomDiscountInnerServiceSMO applyRoomDiscountInnerServiceSMOImpl;
-
-    @Autowired
-    private IFeeDetailInnerServiceSMO iFeeDetailInnerServiceSMO;
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_PAY_FEE_PRE;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Autowired
-    private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;
-
-    @Override
-    public void soService(ServiceDataFlowEvent event) throws ParseException {
-
-        logger.debug("ServiceDataFlowEvent : {}", event);
-
-        DataFlowContext dataFlowContext = event.getDataFlowContext();
-        AppService service = event.getAppService();
-
-        String paramIn = dataFlowContext.getReqData();
-
-        //校验数据
-        validate(paramIn);
-        JSONObject paramObj = JSONObject.parseObject(paramIn);
-
-        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
-        JSONArray businesses = new JSONArray();
-        //判断是否有折扣情况
-        judgeDiscount(paramObj);
-
-        String appId = event.getDataFlowContext().getAppId();
-
-        if (AppDto.WECHAT_MINA_OWNER_APP_ID.equals(appId)) {  //微信小程序支付
-            paramObj.put("primeRate", "6");
-            paramObj.put("remark", "线上小程序支付");
-        } else if (AppDto.WECHAT_OWNER_APP_ID.equals(appId)) {  //微信公众号支付
-            paramObj.put("primeRate", "5");
-            paramObj.put("remark", "线上公众号支付");
-        } else {
-            paramObj.put("primeRate", "6");
-            paramObj.put("remark", "线上小程序支付");
-        }
-
-        //添加单元信息
-        businesses.add(feeBMOImpl.addFeePreDetail(paramObj, dataFlowContext));
-        businesses.add(feeBMOImpl.modifyPreFee(paramObj, dataFlowContext));
-
-        double discountPrice = paramObj.getDouble("discountPrice");
-        if (discountPrice > 0) {
-            addDiscount(paramObj, businesses, dataFlowContext);
-        }
-
-        dealOwnerCartEndTime(paramObj, businesses);
-
-        //判断是否有派单属性ID
-        FeeAttrDto feeAttrDto = new FeeAttrDto();
-        feeAttrDto.setCommunityId(paramObj.getString("communityId"));
-        feeAttrDto.setFeeId(paramObj.getString("feeId"));
-        feeAttrDto.setSpecCd(FeeAttrDto.SPEC_CD_REPAIR);
-        List<FeeAttrDto> feeAttrDtos = feeAttrInnerServiceSMOImpl.queryFeeAttrs(feeAttrDto);
-        //修改 派单状态
-        if (feeAttrDtos != null && feeAttrDtos.size() > 0) {
-            JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
-            business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR);
-            business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 2);
-            business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
-            RepairPoolPo repairPoolPo = new RepairPoolPo();
-            repairPoolPo.setRepairId(feeAttrDtos.get(0).getValue());
-            repairPoolPo.setCommunityId(paramObj.getString("communityId"));
-            repairPoolPo.setState(RepairDto.STATE_APPRAISE);
-            business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(RepairPoolPo.class.getSimpleName(), BeanConvertUtil.beanCovertMap(repairPoolPo));
-            businesses.add(business);
-        }
-        //修改报修派单状态
-        if (feeAttrDtos != null && feeAttrDtos.size() > 0) {
-            JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
-            business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR_USER);
-            business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 3);
-            business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
-            RepairUserDto repairUserDto = new RepairUserDto();
-            repairUserDto.setRepairId(feeAttrDtos.get(0).getValue());
-            repairUserDto.setState(RepairUserDto.STATE_PAY_FEE);
-            //查询待支付状态的记录
-            List<RepairUserDto> repairUserDtoList = repairUserInnerServiceSMO.queryRepairUsers(repairUserDto);
-            Assert.listOnlyOne(repairUserDtoList, "信息错误!");
-            RepairUserPo repairUserPo = new RepairUserPo();
-            repairUserPo.setRuId(repairUserDtoList.get(0).getRuId());
-            repairUserPo.setState(RepairUserDto.STATE_FINISH_PAY_FEE);
-            //如果是待评价状态,就更新结束时间
-            repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
-            DecimalFormat df = new DecimalFormat("0.00");
-            BigDecimal payment_amount = new BigDecimal(paramObj.getString("receivableAmount"));
-            repairUserPo.setContext("已支付" + df.format(payment_amount) + "元");
-            //新增待评价状态
-            JSONObject object = JSONObject.parseObject("{\"datas\":{}}");
-            object.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_REPAIR_USER);
-            object.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 3);
-            object.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
-            RepairUserPo repairUser = new RepairUserPo();
-            repairUser.setRuId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ruId));
-            repairUser.setStartTime(repairUserPo.getEndTime());
-            repairUser.setState(RepairUserDto.STATE_EVALUATE);
-            repairUser.setContext("待评价");
-            repairUser.setCommunityId(paramObj.getString("communityId"));
-            repairUser.setCreateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
-            repairUser.setRepairId(repairUserDtoList.get(0).getRepairId());
-            repairUser.setStaffId(repairUserDtoList.get(0).getStaffId());
-            repairUser.setStaffName(repairUserDtoList.get(0).getStaffName());
-            repairUser.setPreStaffId(repairUserDtoList.get(0).getStaffId());
-            repairUser.setPreStaffName(repairUserDtoList.get(0).getStaffName());
-            repairUser.setPreRuId(repairUserDtoList.get(0).getRuId());
-            repairUser.setRepairEvent("auditUser");
-            object.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(RepairUserPo.class.getSimpleName(), BeanConvertUtil.beanCovertMap(repairUser));
-            business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(RepairUserPo.class.getSimpleName(), BeanConvertUtil.beanCovertMap(repairUserPo));
-            businesses.add(object);
-            businesses.add(business);
-        }
-
-        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.ORDER_PROCESS, Orders.ORDER_PROCESS_ORDER_PRE_SUBMIT);
-        ResponseEntity<String> responseEntity = feeBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
-        //查询 pay_fee_detail 是否缴费
-        FeeDetailDto feeDetailDto = new FeeDetailDto();
-        feeDetailDto.setDetailId(paramObj.getString("detailId"));
-        List<FeeDetailDto> feeDetailDtoList = iFeeDetailInnerServiceSMO.queryBusinessFeeDetails(feeDetailDto);
-        if (feeDetailDtoList != null && feeDetailDtoList.size() == 1) {
-            //获取bId
-            String bId = feeDetailDtoList.get(0).getbId();
-            //获取优惠
-            List<ComputeDiscountDto> computeDiscountDtos = (List<ComputeDiscountDto>) paramObj.get("computeDiscountDtos");
-            if (computeDiscountDtos != null) {
-                for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
-                    if (!StringUtil.isEmpty(computeDiscountDto.getArdId())) {
-                        ApplyRoomDiscountPo applyRoomDiscountPo = new ApplyRoomDiscountPo();
-                        //将业务id更新到空置房优惠里面
-                        applyRoomDiscountPo.setbId(bId);
-                        applyRoomDiscountPo.setArdId(computeDiscountDto.getArdId());
-                        applyRoomDiscountInnerServiceSMOImpl.updateApplyRoomDiscount(applyRoomDiscountPo);
-                    }
-                }
-            }
-        }
-        if (responseEntity.getStatusCode() != HttpStatus.OK) {
-            dataFlowContext.setResponseEntity(responseEntity);
-            return;
-        }
-        JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
-        //这里调整为实收金额
-        paramOut.put("receivableAmount", paramObj.getString("receivableAmount"));
-        paramOut.put("receivedAmount", paramObj.getString("receivedAmount"));
-
-        FeeDto feeDto = (FeeDto) paramObj.get("feeInfo");
-        String feeName = getObjName(feeDto);
-        paramOut.put("feeName", feeName);
-
-        responseEntity = new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
-        dataFlowContext.setResponseEntity(responseEntity);
-    }
-
-
-    private String getObjName(FeeDto feeDto) {
-        //查询小区名称
-        CommunityDto communityDto = new CommunityDto();
-        communityDto.setCommunityId(feeDto.getCommunityId());
-        List<CommunityDto> communityDtos = communityV1InnerServiceSMOImpl.queryCommunitys(communityDto);
-
-        Assert.listOnlyOne(communityDtos, "小区不存在");
-
-        List<FeeAttrDto> feeAttrDtos = feeDto.getFeeAttrDtos();
-        if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
-            return communityDtos.get(0).getName() + "-" + feeDto.getFeeName();
-        }
-
-        for (FeeAttrDto feeAttrDto : feeAttrDtos) {
-            if (FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME.equals(feeAttrDto.getSpecCd())) {
-                return communityDtos.get(0).getName() + "-" + feeAttrDto.getValue() + "-" + feeDto.getFeeName();
-            }
-        }
-
-        return communityDtos.get(0).getName() + "-" + feeDto.getFeeName();
-    }
-
-    private void dealOwnerCartEndTime(JSONObject paramObj, JSONArray businesses) {
-        //为停车费单独处理
-        if (paramObj.containsKey("carPayerObjType")
-                && FeeDto.PAYER_OBJ_TYPE_CAR.equals(paramObj.getString("carPayerObjType"))) {
-            Date feeEndTime = (Date) paramObj.get("carFeeEndTime");
-            OwnerCarDto ownerCarDto = new OwnerCarDto();
-            ownerCarDto.setCommunityId(paramObj.getString("communityId"));
-            ownerCarDto.setCarId(paramObj.getString("carPayerObjId"));
-            List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
-            //车位费用续租
-            if (ownerCarDtos != null) {
-                for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
-                    if (tmpOwnerCarDto.getEndTime().getTime() < feeEndTime.getTime()) {
-                        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
-                        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_CAR);
-                        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
-                        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
-                        OwnerCarPo ownerCarPo = new OwnerCarPo();
-                        ownerCarPo.setMemberId(tmpOwnerCarDto.getMemberId());
-                        ownerCarPo.setEndTime(DateUtil.getFormatTimeString(feeEndTime, DateUtil.DATE_FORMATE_STRING_A));
-                        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(OwnerCarPo.class.getSimpleName(), BeanConvertUtil.beanCovertMap(ownerCarPo));
-                        businesses.add(business);
-                    }
-                }
-            }
-        }
-    }
-
-    private void judgeDiscount(JSONObject paramObj) throws ParseException {
-        FeeDetailDto feeDetailDto = new FeeDetailDto();
-        feeDetailDto.setCommunityId(paramObj.getString("communityId"));
-        feeDetailDto.setFeeId(paramObj.getString("feeId"));
-        feeDetailDto.setCycles(paramObj.getString("cycles"));
-        feeDetailDto.setPayerObjId(paramObj.getString("payerObjId"));
-        feeDetailDto.setPayerObjType(paramObj.getString("payerObjType"));
-        String endTime = paramObj.getString("endTime");  //获取缴费到期时间
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        feeDetailDto.setStartTime(simpleDateFormat.parse(endTime));
-
-        feeDetailDto.setRow(20);
-        feeDetailDto.setPage(1);
-        List<ComputeDiscountDto> computeDiscountDtos = feeDiscountInnerServiceSMOImpl.computeDiscount(feeDetailDto);
-
-        if (computeDiscountDtos == null || computeDiscountDtos.size() < 1) {
-            paramObj.put("discountPrice", 0.0);
-            return;
-        }
-        BigDecimal discountPrice = new BigDecimal(0);
-        for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
-            discountPrice = discountPrice.add(new BigDecimal(computeDiscountDto.getDiscountPrice()));
-        }
-        paramObj.put("discountPrice", discountPrice);
-        paramObj.put("computeDiscountDtos", computeDiscountDtos);
-    }
-
-    private void addDiscount(JSONObject paramObj, JSONArray businesses, DataFlowContext dataFlowContext) {
-        List<ComputeDiscountDto> computeDiscountDtos = (List<ComputeDiscountDto>) paramObj.get("computeDiscountDtos");
-        JSONObject discountBusiness = null;
-        for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
-            if (computeDiscountDto.getDiscountPrice() <= 0) {
-                continue;
-            }
-            JSONObject paramIn = new JSONObject();
-            paramIn.put("discountPrice", computeDiscountDto.getDiscountPrice());
-            paramIn.put("discountId", computeDiscountDto.getDiscountId());
-            paramIn.put("detailId", paramObj.getString("detailId"));
-            paramIn.put("communityId", paramObj.getString("communityId"));
-            paramIn.put("feeId", paramObj.getString("feeId"));
-            discountBusiness = payFeeDetailDiscountBMOImpl.addPayFeeDetailDiscount(paramObj,
-                    paramIn, dataFlowContext);
-            if (discountBusiness != null) {
-                businesses.add(discountBusiness);
-            }
-        }
-    }
-
-    /**
-     * 数据校验
-     *
-     * @param paramIn "communityId": "7020181217000001",
-     *                "memberId": "3456789",
-     *                "memberTypeCd": "390001200001"
-     */
-    private void validate(String paramIn) {
-        Assert.jsonObjectHaveKey(paramIn, "communityId", "请求报文中未包含communityId节点");
-        Assert.jsonObjectHaveKey(paramIn, "cycles", "请求报文中未包含cycles节点");
-        Assert.jsonObjectHaveKey(paramIn, "receivedAmount", "请求报文中未包含receivedAmount节点");
-        Assert.jsonObjectHaveKey(paramIn, "feeId", "请求报文中未包含feeId节点");
-        Assert.jsonObjectHaveKey(paramIn, "appId", "请求报文中未包含appId节点");
-
-        JSONObject paramInObj = JSONObject.parseObject(paramIn);
-        Assert.hasLength(paramInObj.getString("communityId"), "小区ID不能为空");
-        Assert.hasLength(paramInObj.getString("cycles"), "周期不能为空");
-        Assert.hasLength(paramInObj.getString("receivedAmount"), "实收金额不能为空");
-        Assert.hasLength(paramInObj.getString("feeId"), "费用ID不能为空");
-        Assert.hasLength(paramInObj.getString("appId"), "appId不能为空");
-
-
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IFeeInnerServiceSMO getFeeInnerServiceSMOImpl() {
-        return feeInnerServiceSMOImpl;
-    }
-
-    public void setFeeInnerServiceSMOImpl(IFeeInnerServiceSMO feeInnerServiceSMOImpl) {
-        this.feeInnerServiceSMOImpl = feeInnerServiceSMOImpl;
-    }
-
-    public IFeeConfigInnerServiceSMO getFeeConfigInnerServiceSMOImpl() {
-        return feeConfigInnerServiceSMOImpl;
-    }
-
-    public void setFeeConfigInnerServiceSMOImpl(IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl) {
-        this.feeConfigInnerServiceSMOImpl = feeConfigInnerServiceSMOImpl;
-    }
-
-    public IRoomInnerServiceSMO getRoomInnerServiceSMOImpl() {
-        return roomInnerServiceSMOImpl;
-    }
-
-    public void setRoomInnerServiceSMOImpl(IRoomInnerServiceSMO roomInnerServiceSMOImpl) {
-        this.roomInnerServiceSMOImpl = roomInnerServiceSMOImpl;
-    }
-}

+ 0 - 49
service-api/src/main/java/com/java110/api/listener/ownerCarAttr/DeleteOwnerCarAttrListener.java

@@ -1,49 +0,0 @@
-package com.java110.api.listener.ownerCarAttr;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.ownerCarAttr.IOwnerCarAttrBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeOwnerCarAttrConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("deleteOwnerCarAttrListener")
-public class DeleteOwnerCarAttrListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IOwnerCarAttrBMO ownerCarAttrBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        ownerCarAttrBMOImpl.deleteOwnerCarAttr(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeOwnerCarAttrConstant.DELETE_OWNERCARATTR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-}

+ 0 - 82
service-api/src/main/java/com/java110/api/listener/ownerCarAttr/ListOwnerCarAttrsListener.java

@@ -1,82 +0,0 @@
-package com.java110.api.listener.ownerCarAttr;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.intf.user.IOwnerCarAttrInnerServiceSMO;
-import com.java110.dto.ownerCarAttr.OwnerCarAttrDto;
-import com.java110.utils.constant.ServiceCodeOwnerCarAttrConstant;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 查询小区侦听类
- */
-@Java110Listener("listOwnerCarAttrsListener")
-public class ListOwnerCarAttrsListener extends AbstractServiceApiListener {
-
-    @Autowired
-    private IOwnerCarAttrInnerServiceSMO ownerCarAttrInnerServiceSMOImpl;
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeOwnerCarAttrConstant.LIST_OWNERCARATTRS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IOwnerCarAttrInnerServiceSMO getOwnerCarAttrInnerServiceSMOImpl() {
-        return ownerCarAttrInnerServiceSMOImpl;
-    }
-
-    public void setOwnerCarAttrInnerServiceSMOImpl(IOwnerCarAttrInnerServiceSMO ownerCarAttrInnerServiceSMOImpl) {
-        this.ownerCarAttrInnerServiceSMOImpl = ownerCarAttrInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        super.validatePageInfo(reqJson);
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        OwnerCarAttrDto ownerCarAttrDto = BeanConvertUtil.covertBean(reqJson, OwnerCarAttrDto.class);
-
-        int count = ownerCarAttrInnerServiceSMOImpl.queryOwnerCarAttrsCount(ownerCarAttrDto);
-
-        List<OwnerCarAttrDto> ownerCarAttrDtos = null;
-
-        if (count > 0) {
-            ownerCarAttrDtos = ownerCarAttrInnerServiceSMOImpl.queryOwnerCarAttrs(ownerCarAttrDto);
-        } else {
-            ownerCarAttrDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, ownerCarAttrDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        context.setResponseEntity(responseEntity);
-
-    }
-}

+ 0 - 47
service-api/src/main/java/com/java110/api/listener/ownerCarAttr/SaveOwnerCarAttrListener.java

@@ -1,47 +0,0 @@
-package com.java110.api.listener.ownerCarAttr;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.ownerCarAttr.IOwnerCarAttrBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeOwnerCarAttrConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-/**
- * 保存商户侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("saveOwnerCarAttrListener")
-public class SaveOwnerCarAttrListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IOwnerCarAttrBMO ownerCarAttrBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-        ownerCarAttrBMOImpl.addOwnerCarAttr(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeOwnerCarAttrConstant.ADD_OWNERCARATTR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-}

+ 0 - 47
service-api/src/main/java/com/java110/api/listener/ownerCarAttr/UpdateOwnerCarAttrListener.java

@@ -1,47 +0,0 @@
-package com.java110.api.listener.ownerCarAttr;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.ownerCarAttr.IOwnerCarAttrBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeOwnerCarAttrConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-/**
- * 保存业主车辆属性侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("updateOwnerCarAttrListener")
-public class UpdateOwnerCarAttrListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IOwnerCarAttrBMO ownerCarAttrBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
-        Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        ownerCarAttrBMOImpl.updateOwnerCarAttr(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeOwnerCarAttrConstant.UPDATE_OWNERCARATTR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-}

+ 25 - 55
service-api/src/main/java/com/java110/api/listener/fee/DeleteFeeListener.java

@@ -1,41 +1,27 @@
-package com.java110.api.listener.fee;
+package com.java110.fee.cmd.fee;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.fee.IFeeBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.fee.FeeDetailDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.intf.community.IRoomInnerServiceSMO;
 import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
+import com.java110.po.fee.PayFeePo;
 import com.java110.utils.cache.MappingCache;
-import com.java110.utils.constant.ServiceCodeConstant;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
+import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 
 import java.util.List;
 
-/**
- * @ClassName SaveRoomCreateFeeListener
- * @Description TODO
- * @Author wuxw
- * @Date 2020/1/31 15:57
- * @Version 1.0
- * add by wuxw 2020/1/31
- **/
-@Java110Listener("deleteFeeListener")
-public class DeleteFeeListener extends AbstractServiceApiPlusListener {
-    private static Logger logger = LoggerFactory.getLogger(DeleteFeeListener.class);
-    @Autowired
-    private IFeeBMO feeBMOImpl;
-
-    private static final int DEFAULT_ADD_FEE_COUNT = 200;
+@Java110Cmd(serviceCode = "fee.deleteFee")
+public class DeleteFeeCmd extends Cmd {
 
     @Autowired
     private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
@@ -44,20 +30,13 @@ public class DeleteFeeListener extends AbstractServiceApiPlusListener {
     private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
 
     @Autowired
-    private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_DELETE_FEE;
-    }
+    private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
 
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
+    @Autowired
+    private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
 
     @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         // super.validatePageInfo(pd);
         Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
         Assert.hasKeyAndValue(reqJson, "feeId", "未包含feeId");
@@ -90,27 +69,18 @@ public class DeleteFeeListener extends AbstractServiceApiPlusListener {
         if (feeDetailDtos != null && feeDetailDtos.size() > 0) {
             throw new IllegalArgumentException("存在缴费记录,不能取消,如果需要取消,请先退费");
         }
-
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        feeBMOImpl.deleteFee(reqJson, context);
-
-
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-    public IRoomInnerServiceSMO getRoomInnerServiceSMOImpl() {
-        return roomInnerServiceSMOImpl;
-    }
-
-    public void setRoomInnerServiceSMOImpl(IRoomInnerServiceSMO roomInnerServiceSMOImpl) {
-        this.roomInnerServiceSMOImpl = roomInnerServiceSMOImpl;
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        JSONObject businessUnit = new JSONObject();
+        businessUnit.put("feeId", reqJson.getString("feeId"));
+        businessUnit.put("communityId", reqJson.getString("communityId"));
+        PayFeePo payFeePo = BeanConvertUtil.covertBean(businessUnit, PayFeePo.class);
+
+        int flag = payFeeV1InnerServiceSMOImpl.deletePayFee(payFeePo);
+        if (flag < 1) {
+            throw new IllegalArgumentException("删除失败");
+        }
     }
 }

+ 63 - 0
service-fee/src/main/java/com/java110/fee/cmd/fee/DeleteTempCarFeeConfigCmd.java

@@ -0,0 +1,63 @@
+package com.java110.fee.cmd.fee;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.intf.fee.ITempCarFeeConfigAttrV1InnerServiceSMO;
+import com.java110.intf.fee.ITempCarFeeConfigV1InnerServiceSMO;
+import com.java110.po.tempCarFeeConfig.TempCarFeeConfigPo;
+import com.java110.po.tempCarFeeConfigAttr.TempCarFeeConfigAttrPo;
+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 org.springframework.beans.factory.annotation.Autowired;
+
+@Java110Cmd(serviceCode = "fee.deleteTempCarFeeConfig")
+public class DeleteTempCarFeeConfigCmd extends Cmd {
+
+    @Autowired
+    private ITempCarFeeConfigV1InnerServiceSMO tempCarFeeConfigV1InnerServiceSMOImpl;
+
+    @Autowired
+    private ITempCarFeeConfigAttrV1InnerServiceSMO tempCarFeeConfigAttrV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Assert.hasKeyAndValue(reqJson, "configId", "configId不能为空");
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        TempCarFeeConfigPo tempCarFeeConfigPo = BeanConvertUtil.covertBean(reqJson, TempCarFeeConfigPo.class);
+        int flag = tempCarFeeConfigV1InnerServiceSMOImpl.deleteTempCarFeeConfig(tempCarFeeConfigPo);
+
+        if (flag < 1) {
+            throw new CmdException("删除临时车费失败");
+        }
+
+        JSONArray attrs = reqJson.getJSONArray("tempCarFeeConfigAttrs");
+        if (attrs == null || attrs.size() < 1) {
+            return;
+        }
+
+        JSONObject attr = null;
+        for (int attrIndex = 0; attrIndex < attrs.size(); attrIndex++) {
+            attr = attrs.getJSONObject(attrIndex);
+            attr.put("ruleId", reqJson.getString("ruleId"));
+            attr.put("communityId", reqJson.getString("communityId"));
+            if (!attr.containsKey("attrId") || attr.getString("attrId").startsWith("-") || StringUtil.isEmpty(attr.getString("attrId"))) {
+                continue;
+            }
+            TempCarFeeConfigAttrPo tempCarFeeConfigAttrPo = BeanConvertUtil.covertBean(attr, TempCarFeeConfigAttrPo.class);
+            flag = tempCarFeeConfigAttrV1InnerServiceSMOImpl.deleteTempCarFeeConfigAttr(tempCarFeeConfigAttrPo);
+            if (flag < 1) {
+                throw new CmdException("删除临时车费失败");
+            }
+        }
+    }
+}

+ 60 - 0
service-fee/src/main/java/com/java110/fee/cmd/fee/FinishFeeCmd.java

@@ -0,0 +1,60 @@
+package com.java110.fee.cmd.fee;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.fee.FeeDto;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
+import com.java110.po.fee.PayFeePo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * 结束费用
+ */
+@Java110Cmd(serviceCode = "fee.finishFee")
+public class FinishFeeCmd extends Cmd {
+
+
+    @Autowired
+    private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
+    @Autowired
+    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
+
+    @Autowired
+    private IPayFeeV1InnerServiceSMO feeV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        // super.validatePageInfo(pd);
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
+        Assert.hasKeyAndValue(reqJson, "feeId", "未包含feeId");
+
+        FeeDto feeDto = new FeeDto();
+        feeDto.setCommunityId(reqJson.getString("communityId"));
+        feeDto.setFeeId(reqJson.getString("feeId"));
+
+        List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+
+        Assert.listOnlyOne(feeDtos, "未查询到费用信息 或查询到多条" + reqJson);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        PayFeePo payFeePo = BeanConvertUtil.covertBean(reqJson, PayFeePo.class);
+        payFeePo.setState(FeeDto.STATE_FINISH);
+        int flag = feeV1InnerServiceSMOImpl.updatePayFee(payFeePo);
+        if (flag < 1) {
+            throw new CmdException("结束费用失败");
+        }
+    }
+}

+ 12 - 31
service-api/src/main/java/com/java110/api/listener/fee/ListBillOweFeeListener.java

@@ -1,31 +1,26 @@
-package com.java110.api.listener.fee;
+package com.java110.fee.cmd.fee;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.fee.BillOweFeeDto;
 import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
-import com.java110.dto.fee.BillOweFeeDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.vo.ResultVo;
-import com.java110.utils.constant.ServiceCodeFeeConfigConstant;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import java.util.ArrayList;
 import java.util.List;
 
-
-/**
- * 查询账单侦听类
- */
-@Java110Listener("listBillOweFeeListener")
-public class ListBillOweFeeListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "fee.listBillOweFee")
+public class ListBillOweFeeCmd extends Cmd {
 
     @Autowired
     private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
@@ -34,26 +29,13 @@ public class ListBillOweFeeListener extends AbstractServiceApiListener {
     private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
 
     @Override
-    public String getServiceCode() {
-        return ServiceCodeFeeConfigConstant.LIST_BILL_OWE_FEE;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         super.validatePageInfo(reqJson);
         Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
-
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         BillOweFeeDto billOweFeeDto = BeanConvertUtil.covertBean(reqJson, BillOweFeeDto.class);
 
         int count = feeInnerServiceSMOImpl.queryBillOweFeeCount(billOweFeeDto);
@@ -68,6 +50,5 @@ public class ListBillOweFeeListener extends AbstractServiceApiListener {
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
-
     }
 }

+ 16 - 52
service-api/src/main/java/com/java110/api/listener/fee/ListOwnerOweFeeListener.java

@@ -1,16 +1,10 @@
-package com.java110.api.listener.fee;
+package com.java110.fee.cmd.fee;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
-import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
-import com.java110.intf.fee.IFeeInnerServiceSMO;
-import com.java110.intf.user.IOwnerCarInnerServiceSMO;
-import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.RoomDto;
 import com.java110.dto.fee.BillOweFeeDto;
 import com.java110.dto.fee.FeeConfigDto;
@@ -18,12 +12,17 @@ import com.java110.dto.fee.FeeDto;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.owner.OwnerRoomRelDto;
 import com.java110.dto.parking.ParkingSpaceDto;
-import com.java110.utils.constant.ServiceCodeFeeConfigConstant;
+import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 
 import java.math.BigDecimal;
@@ -33,13 +32,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
-
-/**
- * 查询业主是否有欠费
- */
-@Java110Listener("listOwnerOweFeeListener")
-public class ListOwnerOweFeeListener extends AbstractServiceApiListener {
-
+@Java110Cmd(serviceCode = "fee.listOwnerOweFee")
+public class ListOwnerOweFeeCmd extends Cmd {
     @Autowired
     private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
 
@@ -57,43 +51,15 @@ public class ListOwnerOweFeeListener extends AbstractServiceApiListener {
 
     @Autowired
     private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeFeeConfigConstant.LIST_OWNER_OWE_FEE;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
     @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IFeeConfigInnerServiceSMO getFeeConfigInnerServiceSMOImpl() {
-        return feeConfigInnerServiceSMOImpl;
-    }
-
-    public void setFeeConfigInnerServiceSMOImpl(IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl) {
-        this.feeConfigInnerServiceSMOImpl = feeConfigInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         //super.validatePageInfo(reqJson);
         Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
         Assert.hasKeyAndValue(reqJson, "ownerId", "未包含小区业主ID");
-
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         //1.0 查询业主房屋 查询业主是否有房屋欠费
         OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
         ownerRoomRelDto.setOwnerId(reqJson.getString("ownerId"));
@@ -118,10 +84,8 @@ public class ListOwnerOweFeeListener extends AbstractServiceApiListener {
 
         ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(1, resultFees.size(), resultFees);
         context.setResponseEntity(responseEntity);
-
     }
 
-
     private void getParkingSpaceOweFee(List<OwnerCarDto> ownerCarDtos, JSONObject reqJson, List<FeeDto> resultFees) {
         String payObjName = "";
         for (OwnerCarDto ownerCarDto : ownerCarDtos) {

+ 15 - 57
service-api/src/main/java/com/java110/api/listener/fee/ListParkingSpacesWhereFeeSetListener.java

@@ -1,36 +1,30 @@
-package com.java110.api.listener.fee;
+package com.java110.fee.cmd.fee;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.parking.ParkingSpaceDto;
+import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.intf.user.IOwnerInnerServiceSMO;
 import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
-import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
-import com.java110.dto.owner.OwnerCarDto;
-import com.java110.dto.parking.ParkingSpaceDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeFeeConfigConstant;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.ApiParkingSpaceDataVo;
 import com.java110.vo.api.ApiParkingSpaceVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import java.util.ArrayList;
 import java.util.List;
 
-
-/**
- * 查询需要设置费用的房屋
- */
-@Java110Listener("listParkingSpacesWhereFeeSetListener")
-public class ListParkingSpacesWhereFeeSetListener extends AbstractServiceApiListener {
-
+@Java110Cmd(serviceCode = "fee.listParkingSpacesWhereFeeSet")
+public class ListParkingSpacesWhereFeeSetCmd extends Cmd {
 
     @Autowired
     private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
@@ -45,36 +39,17 @@ public class ListParkingSpacesWhereFeeSetListener extends AbstractServiceApiList
     private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
 
     @Override
-    public String getServiceCode() {
-        return ServiceCodeFeeConfigConstant.LIST_PARKING_SPACE_WHERE_FEE_SET;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         super.validatePageInfo(reqJson);
         Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         ApiParkingSpaceVo apiParkingSpaceVo = new ApiParkingSpaceVo();
         //根据 业主来定位房屋信息
         if (reqJson.containsKey("carNum")) {
             queryParkingSpaceByCarInfo(apiParkingSpaceVo, reqJson, context);
-
             return;
         }
 
@@ -104,7 +79,7 @@ public class ListParkingSpacesWhereFeeSetListener extends AbstractServiceApiList
      * @param apiParkingSpaceVo
      * @param reqJson
      */
-    private void queryParkingSpaceByCarInfo(ApiParkingSpaceVo apiParkingSpaceVo, JSONObject reqJson, DataFlowContext context) {
+    private void queryParkingSpaceByCarInfo(ApiParkingSpaceVo apiParkingSpaceVo, JSONObject reqJson, ICmdDataFlowContext context) {
 
         OwnerCarDto ownerCarDto = BeanConvertUtil.covertBean(reqJson, OwnerCarDto.class);
         //ownerCarDto.setByOwnerInfo(true);
@@ -126,7 +101,7 @@ public class ListParkingSpacesWhereFeeSetListener extends AbstractServiceApiList
         context.setResponseEntity(responseEntity);
     }
 
-    private List<ParkingSpaceDto> refreshCarParkingSpaces(String communityId,  List<OwnerCarDto> ownerCarDtos) {
+    private List<ParkingSpaceDto> refreshCarParkingSpaces(String communityId, List<OwnerCarDto> ownerCarDtos) {
 
         List<String> psIds = new ArrayList<>();
 
@@ -181,21 +156,4 @@ public class ListParkingSpacesWhereFeeSetListener extends AbstractServiceApiList
             }
         }
     }
-
-
-    public IOwnerInnerServiceSMO getOwnerInnerServiceSMOImpl() {
-        return ownerInnerServiceSMOImpl;
-    }
-
-    public void setOwnerInnerServiceSMOImpl(IOwnerInnerServiceSMO ownerInnerServiceSMOImpl) {
-        this.ownerInnerServiceSMOImpl = ownerInnerServiceSMOImpl;
-    }
-
-    public IOwnerRoomRelInnerServiceSMO getOwnerRoomRelInnerServiceSMOImpl() {
-        return ownerRoomRelInnerServiceSMOImpl;
-    }
-
-    public void setOwnerRoomRelInnerServiceSMOImpl(IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl) {
-        this.ownerRoomRelInnerServiceSMOImpl = ownerRoomRelInnerServiceSMOImpl;
-    }
 }

+ 71 - 0
service-fee/src/main/java/com/java110/fee/cmd/tempCarFeeConfigAttr/DeleteTempCarFeeConfigAttrCmd.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.fee.cmd.tempCarFeeConfigAttr;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.fee.ITempCarFeeConfigAttrV1InnerServiceSMO;
+import com.java110.po.tempCarFeeConfigAttr.TempCarFeeConfigAttrPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+/**
+ * 类表述:删除
+ * 服务编码:tempCarFeeConfigAttr.deleteTempCarFeeConfigAttr
+ * 请求路劲:/app/tempCarFeeConfigAttr.DeleteTempCarFeeConfigAttr
+ * add by 吴学文 at 2022-06-27 13:39:52 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "tempCarFeeConfigAttr.deleteTempCarFeeConfigAttr")
+public class DeleteTempCarFeeConfigAttrCmd extends Cmd {
+  private static Logger logger = LoggerFactory.getLogger(DeleteTempCarFeeConfigAttrCmd.class);
+
+    @Autowired
+    private ITempCarFeeConfigAttrV1InnerServiceSMO tempCarFeeConfigAttrV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
+Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+       TempCarFeeConfigAttrPo tempCarFeeConfigAttrPo = BeanConvertUtil.covertBean(reqJson, TempCarFeeConfigAttrPo.class);
+        int flag = tempCarFeeConfigAttrV1InnerServiceSMOImpl.deleteTempCarFeeConfigAttr(tempCarFeeConfigAttrPo);
+
+        if (flag < 1) {
+            throw new CmdException("删除数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

+ 84 - 0
service-fee/src/main/java/com/java110/fee/cmd/tempCarFeeConfigAttr/ListTempCarFeeConfigAttrCmd.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.fee.cmd.tempCarFeeConfigAttr;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.fee.ITempCarFeeConfigAttrV1InnerServiceSMO;
+import com.java110.po.tempCarFeeConfigAttr.TempCarFeeConfigAttrPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.java110.dto.tempCarFeeConfigAttr.TempCarFeeConfigAttrDto;
+import java.util.List;
+import java.util.ArrayList;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * 类表述:查询
+ * 服务编码:tempCarFeeConfigAttr.listTempCarFeeConfigAttr
+ * 请求路劲:/app/tempCarFeeConfigAttr.ListTempCarFeeConfigAttr
+ * add by 吴学文 at 2022-06-27 13:39:52 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "tempCarFeeConfigAttr.listTempCarFeeConfigAttr")
+public class ListTempCarFeeConfigAttrCmd extends Cmd {
+
+  private static Logger logger = LoggerFactory.getLogger(ListTempCarFeeConfigAttrCmd.class);
+    @Autowired
+    private ITempCarFeeConfigAttrV1InnerServiceSMO tempCarFeeConfigAttrV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+           TempCarFeeConfigAttrDto tempCarFeeConfigAttrDto = BeanConvertUtil.covertBean(reqJson, TempCarFeeConfigAttrDto.class);
+
+           int count = tempCarFeeConfigAttrV1InnerServiceSMOImpl.queryTempCarFeeConfigAttrsCount(tempCarFeeConfigAttrDto);
+
+           List<TempCarFeeConfigAttrDto> tempCarFeeConfigAttrDtos = null;
+
+           if (count > 0) {
+               tempCarFeeConfigAttrDtos = tempCarFeeConfigAttrV1InnerServiceSMOImpl.queryTempCarFeeConfigAttrs(tempCarFeeConfigAttrDto);
+           } else {
+               tempCarFeeConfigAttrDtos = new ArrayList<>();
+           }
+
+           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, tempCarFeeConfigAttrDtos);
+
+           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+           cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
+}

+ 78 - 0
service-fee/src/main/java/com/java110/fee/cmd/tempCarFeeConfigAttr/SaveTempCarFeeConfigAttrCmd.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.fee.cmd.tempCarFeeConfigAttr;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.fee.ITempCarFeeConfigAttrV1InnerServiceSMO;
+import com.java110.po.tempCarFeeConfigAttr.TempCarFeeConfigAttrPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 类表述:保存
+ * 服务编码:tempCarFeeConfigAttr.saveTempCarFeeConfigAttr
+ * 请求路劲:/app/tempCarFeeConfigAttr.SaveTempCarFeeConfigAttr
+ * add by 吴学文 at 2022-06-27 13:39:52 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "tempCarFeeConfigAttr.saveTempCarFeeConfigAttr")
+public class SaveTempCarFeeConfigAttrCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(SaveTempCarFeeConfigAttrCmd.class);
+
+    public static final String CODE_PREFIX_ID = "10";
+
+    @Autowired
+    private ITempCarFeeConfigAttrV1InnerServiceSMO tempCarFeeConfigAttrV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "configId", "请求报文中未包含configId");
+Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
+Assert.hasKeyAndValue(reqJson, "value", "请求报文中未包含value");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+       TempCarFeeConfigAttrPo tempCarFeeConfigAttrPo = BeanConvertUtil.covertBean(reqJson, TempCarFeeConfigAttrPo.class);
+        tempCarFeeConfigAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        int flag = tempCarFeeConfigAttrV1InnerServiceSMOImpl.saveTempCarFeeConfigAttr(tempCarFeeConfigAttrPo);
+
+        if (flag < 1) {
+            throw new CmdException("保存数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

+ 75 - 0
service-fee/src/main/java/com/java110/fee/cmd/tempCarFeeConfigAttr/UpdateTempCarFeeConfigAttrCmd.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.fee.cmd.tempCarFeeConfigAttr;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.fee.ITempCarFeeConfigAttrV1InnerServiceSMO;
+import com.java110.po.tempCarFeeConfigAttr.TempCarFeeConfigAttrPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * 类表述:更新
+ * 服务编码:tempCarFeeConfigAttr.updateTempCarFeeConfigAttr
+ * 请求路劲:/app/tempCarFeeConfigAttr.UpdateTempCarFeeConfigAttr
+ * add by 吴学文 at 2022-06-27 13:39:52 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "tempCarFeeConfigAttr.updateTempCarFeeConfigAttr")
+public class UpdateTempCarFeeConfigAttrCmd extends Cmd {
+
+  private static Logger logger = LoggerFactory.getLogger(UpdateTempCarFeeConfigAttrCmd.class);
+
+
+    @Autowired
+    private ITempCarFeeConfigAttrV1InnerServiceSMO tempCarFeeConfigAttrV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
+Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+       TempCarFeeConfigAttrPo tempCarFeeConfigAttrPo = BeanConvertUtil.covertBean(reqJson, TempCarFeeConfigAttrPo.class);
+        int flag = tempCarFeeConfigAttrV1InnerServiceSMOImpl.updateTempCarFeeConfigAttr(tempCarFeeConfigAttrPo);
+
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

+ 77 - 0
service-fee/src/main/java/com/java110/fee/dao/ITempCarFeeConfigAttrV1ServiceDao.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.fee.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述:
+ * add by 吴学文 at 2022-06-27 13:39:52 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+public interface ITempCarFeeConfigAttrV1ServiceDao {
+
+
+    /**
+     * 保存 临时费用配置信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    int saveTempCarFeeConfigAttrInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询临时费用配置信息(instance过程)
+     * 根据bId 查询临时费用配置信息
+     * @param info bId 信息
+     * @return 临时费用配置信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getTempCarFeeConfigAttrInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改临时费用配置信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    int updateTempCarFeeConfigAttrInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询临时费用配置总数
+     *
+     * @param info 临时费用配置信息
+     * @return 临时费用配置数量
+     */
+    int queryTempCarFeeConfigAttrsCount(Map info);
+
+}

+ 77 - 0
service-fee/src/main/java/com/java110/fee/dao/ITempCarFeeConfigV1ServiceDao.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.fee.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述:
+ * add by 吴学文 at 2022-06-27 11:41:00 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+public interface ITempCarFeeConfigV1ServiceDao {
+
+
+    /**
+     * 保存 临时费用配置信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    int saveTempCarFeeConfigInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询临时费用配置信息(instance过程)
+     * 根据bId 查询临时费用配置信息
+     * @param info bId 信息
+     * @return 临时费用配置信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getTempCarFeeConfigInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改临时费用配置信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    int updateTempCarFeeConfigInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询临时费用配置总数
+     *
+     * @param info 临时费用配置信息
+     * @return 临时费用配置数量
+     */
+    int queryTempCarFeeConfigsCount(Map info);
+
+}

+ 112 - 0
service-fee/src/main/java/com/java110/fee/dao/impl/TempCarFeeConfigAttrV1ServiceDaoImpl.java

@@ -0,0 +1,112 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.fee.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.fee.dao.ITempCarFeeConfigAttrV1ServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述:
+ * add by 吴学文 at 2022-06-27 13:39:52 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Service("tempCarFeeConfigAttrV1ServiceDaoImpl")
+public class TempCarFeeConfigAttrV1ServiceDaoImpl extends BaseServiceDao implements ITempCarFeeConfigAttrV1ServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(TempCarFeeConfigAttrV1ServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存临时费用配置信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int saveTempCarFeeConfigAttrInfo(Map info) throws DAOException {
+        logger.debug("保存 saveTempCarFeeConfigAttrInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("tempCarFeeConfigAttrV1ServiceDaoImpl.saveTempCarFeeConfigAttrInfo",info);
+
+        return saveFlag;
+    }
+
+
+    /**
+     * 查询临时费用配置信息(instance)
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getTempCarFeeConfigAttrInfo(Map info) throws DAOException {
+        logger.debug("查询 getTempCarFeeConfigAttrInfo 入参 info : {}",info);
+
+        List<Map> businessTempCarFeeConfigAttrInfos = sqlSessionTemplate.selectList("tempCarFeeConfigAttrV1ServiceDaoImpl.getTempCarFeeConfigAttrInfo",info);
+
+        return businessTempCarFeeConfigAttrInfos;
+    }
+
+
+    /**
+     * 修改临时费用配置信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int updateTempCarFeeConfigAttrInfo(Map info) throws DAOException {
+        logger.debug("修改 updateTempCarFeeConfigAttrInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("tempCarFeeConfigAttrV1ServiceDaoImpl.updateTempCarFeeConfigAttrInfo",info);
+
+        return saveFlag;
+    }
+
+     /**
+     * 查询临时费用配置数量
+     * @param info 临时费用配置信息
+     * @return 临时费用配置数量
+     */
+    @Override
+    public int queryTempCarFeeConfigAttrsCount(Map info) {
+        logger.debug("查询 queryTempCarFeeConfigAttrsCount 入参 info : {}",info);
+
+        List<Map> businessTempCarFeeConfigAttrInfos = sqlSessionTemplate.selectList("tempCarFeeConfigAttrV1ServiceDaoImpl.queryTempCarFeeConfigAttrsCount", info);
+        if (businessTempCarFeeConfigAttrInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessTempCarFeeConfigAttrInfos.get(0).get("count").toString());
+    }
+
+
+}

+ 112 - 0
service-fee/src/main/java/com/java110/fee/dao/impl/TempCarFeeConfigV1ServiceDaoImpl.java

@@ -0,0 +1,112 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.fee.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.fee.dao.ITempCarFeeConfigV1ServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述:
+ * add by 吴学文 at 2022-06-27 11:41:00 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Service("tempCarFeeConfigV1ServiceDaoImpl")
+public class TempCarFeeConfigV1ServiceDaoImpl extends BaseServiceDao implements ITempCarFeeConfigV1ServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(TempCarFeeConfigV1ServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存临时费用配置信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int saveTempCarFeeConfigInfo(Map info) throws DAOException {
+        logger.debug("保存 saveTempCarFeeConfigInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("tempCarFeeConfigV1ServiceDaoImpl.saveTempCarFeeConfigInfo",info);
+
+        return saveFlag;
+    }
+
+
+    /**
+     * 查询临时费用配置信息(instance)
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getTempCarFeeConfigInfo(Map info) throws DAOException {
+        logger.debug("查询 getTempCarFeeConfigInfo 入参 info : {}",info);
+
+        List<Map> businessTempCarFeeConfigInfos = sqlSessionTemplate.selectList("tempCarFeeConfigV1ServiceDaoImpl.getTempCarFeeConfigInfo",info);
+
+        return businessTempCarFeeConfigInfos;
+    }
+
+
+    /**
+     * 修改临时费用配置信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int updateTempCarFeeConfigInfo(Map info) throws DAOException {
+        logger.debug("修改 updateTempCarFeeConfigInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("tempCarFeeConfigV1ServiceDaoImpl.updateTempCarFeeConfigInfo",info);
+
+        return saveFlag;
+    }
+
+     /**
+     * 查询临时费用配置数量
+     * @param info 临时费用配置信息
+     * @return 临时费用配置数量
+     */
+    @Override
+    public int queryTempCarFeeConfigsCount(Map info) {
+        logger.debug("查询 queryTempCarFeeConfigsCount 入参 info : {}",info);
+
+        List<Map> businessTempCarFeeConfigInfos = sqlSessionTemplate.selectList("tempCarFeeConfigV1ServiceDaoImpl.queryTempCarFeeConfigsCount", info);
+        if (businessTempCarFeeConfigInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessTempCarFeeConfigInfos.get(0).get("count").toString());
+    }
+
+
+}

+ 89 - 0
service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeConfigAttrV1InnerServiceSMOImpl.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.fee.smo.impl;
+
+
+import com.java110.fee.dao.ITempCarFeeConfigAttrV1ServiceDao;
+import com.java110.intf.fee.ITempCarFeeConfigAttrV1InnerServiceSMO;
+import com.java110.dto.tempCarFeeConfigAttr.TempCarFeeConfigAttrDto;
+import com.java110.po.tempCarFeeConfigAttr.TempCarFeeConfigAttrPo;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.user.UserDto;
+import com.java110.dto.PageDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 类表述: 服务之前调用的接口实现类,不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-06-27 13:39:52 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@RestController
+public class TempCarFeeConfigAttrV1InnerServiceSMOImpl extends BaseServiceSMO implements ITempCarFeeConfigAttrV1InnerServiceSMO {
+
+    @Autowired
+    private ITempCarFeeConfigAttrV1ServiceDao tempCarFeeConfigAttrV1ServiceDaoImpl;
+
+
+    @Override
+    public int saveTempCarFeeConfigAttr(@RequestBody  TempCarFeeConfigAttrPo tempCarFeeConfigAttrPo) {
+        int saveFlag = tempCarFeeConfigAttrV1ServiceDaoImpl.saveTempCarFeeConfigAttrInfo(BeanConvertUtil.beanCovertMap(tempCarFeeConfigAttrPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int updateTempCarFeeConfigAttr(@RequestBody  TempCarFeeConfigAttrPo tempCarFeeConfigAttrPo) {
+        int saveFlag = tempCarFeeConfigAttrV1ServiceDaoImpl.updateTempCarFeeConfigAttrInfo(BeanConvertUtil.beanCovertMap(tempCarFeeConfigAttrPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int deleteTempCarFeeConfigAttr(@RequestBody  TempCarFeeConfigAttrPo tempCarFeeConfigAttrPo) {
+       tempCarFeeConfigAttrPo.setStatusCd("1");
+       int saveFlag = tempCarFeeConfigAttrV1ServiceDaoImpl.updateTempCarFeeConfigAttrInfo(BeanConvertUtil.beanCovertMap(tempCarFeeConfigAttrPo));
+       return saveFlag;
+    }
+
+    @Override
+    public List<TempCarFeeConfigAttrDto> queryTempCarFeeConfigAttrs(@RequestBody  TempCarFeeConfigAttrDto tempCarFeeConfigAttrDto) {
+
+        //校验是否传了 分页信息
+
+        int page = tempCarFeeConfigAttrDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            tempCarFeeConfigAttrDto.setPage((page - 1) * tempCarFeeConfigAttrDto.getRow());
+        }
+
+        List<TempCarFeeConfigAttrDto> tempCarFeeConfigAttrs = BeanConvertUtil.covertBeanList(tempCarFeeConfigAttrV1ServiceDaoImpl.getTempCarFeeConfigAttrInfo(BeanConvertUtil.beanCovertMap(tempCarFeeConfigAttrDto)), TempCarFeeConfigAttrDto.class);
+
+        return tempCarFeeConfigAttrs;
+    }
+
+
+    @Override
+    public int queryTempCarFeeConfigAttrsCount(@RequestBody TempCarFeeConfigAttrDto tempCarFeeConfigAttrDto) {
+        return tempCarFeeConfigAttrV1ServiceDaoImpl.queryTempCarFeeConfigAttrsCount(BeanConvertUtil.beanCovertMap(tempCarFeeConfigAttrDto));    }
+
+}

+ 89 - 0
service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeConfigV1InnerServiceSMOImpl.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.fee.smo.impl;
+
+
+import com.java110.fee.dao.ITempCarFeeConfigV1ServiceDao;
+import com.java110.intf.fee.ITempCarFeeConfigV1InnerServiceSMO;
+import com.java110.dto.tempCarFeeConfig.TempCarFeeConfigDto;
+import com.java110.po.tempCarFeeConfig.TempCarFeeConfigPo;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.user.UserDto;
+import com.java110.dto.PageDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 类表述: 服务之前调用的接口实现类,不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-06-27 11:41:00 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@RestController
+public class TempCarFeeConfigV1InnerServiceSMOImpl extends BaseServiceSMO implements ITempCarFeeConfigV1InnerServiceSMO {
+
+    @Autowired
+    private ITempCarFeeConfigV1ServiceDao tempCarFeeConfigV1ServiceDaoImpl;
+
+
+    @Override
+    public int saveTempCarFeeConfig(@RequestBody  TempCarFeeConfigPo tempCarFeeConfigPo) {
+        int saveFlag = tempCarFeeConfigV1ServiceDaoImpl.saveTempCarFeeConfigInfo(BeanConvertUtil.beanCovertMap(tempCarFeeConfigPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int updateTempCarFeeConfig(@RequestBody  TempCarFeeConfigPo tempCarFeeConfigPo) {
+        int saveFlag = tempCarFeeConfigV1ServiceDaoImpl.updateTempCarFeeConfigInfo(BeanConvertUtil.beanCovertMap(tempCarFeeConfigPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int deleteTempCarFeeConfig(@RequestBody  TempCarFeeConfigPo tempCarFeeConfigPo) {
+       tempCarFeeConfigPo.setStatusCd("1");
+       int saveFlag = tempCarFeeConfigV1ServiceDaoImpl.updateTempCarFeeConfigInfo(BeanConvertUtil.beanCovertMap(tempCarFeeConfigPo));
+       return saveFlag;
+    }
+
+    @Override
+    public List<TempCarFeeConfigDto> queryTempCarFeeConfigs(@RequestBody  TempCarFeeConfigDto tempCarFeeConfigDto) {
+
+        //校验是否传了 分页信息
+
+        int page = tempCarFeeConfigDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            tempCarFeeConfigDto.setPage((page - 1) * tempCarFeeConfigDto.getRow());
+        }
+
+        List<TempCarFeeConfigDto> tempCarFeeConfigs = BeanConvertUtil.covertBeanList(tempCarFeeConfigV1ServiceDaoImpl.getTempCarFeeConfigInfo(BeanConvertUtil.beanCovertMap(tempCarFeeConfigDto)), TempCarFeeConfigDto.class);
+
+        return tempCarFeeConfigs;
+    }
+
+
+    @Override
+    public int queryTempCarFeeConfigsCount(@RequestBody TempCarFeeConfigDto tempCarFeeConfigDto) {
+        return tempCarFeeConfigV1ServiceDaoImpl.queryTempCarFeeConfigsCount(BeanConvertUtil.beanCovertMap(tempCarFeeConfigDto));    }
+
+}

+ 2 - 2
service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCarCmd.java

@@ -23,8 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 
-@Java110Cmd(serviceCode = "owner.deleteOwnerCar")
-public class DeleteOwnerCarCmd extends Cmd {
+@Java110Cmd(serviceCode = "owner.deleteOwnerCars")
+public class DeleteOwnerCarsCmd extends Cmd {
     @Autowired
     private IFeeInnerServiceSMO feeInnerServiceSMOImpl;