优化房屋收费 修改为cmd 模式

java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml

@@ -36,9 +36,6 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
         </if>
@@ -97,9 +94,7 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
+
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
         </if>
@@ -157,9 +152,7 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
+
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
         </if>
@@ -280,9 +273,7 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
+
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
         </if>
@@ -420,9 +411,7 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
+
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
         </if>
@@ -486,9 +475,7 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
+
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
         </if>
@@ -557,9 +544,7 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
+
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
         </if>
@@ -631,9 +616,7 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
+
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
         </if>
@@ -825,9 +808,7 @@
         <if test="bId !=null and bId != ''">
             and bo.b_id= #{bId}
         </if>
-        <if test="userId !=null and userId != ''">
-            and bo.user_id= #{userId}
-        </if>
+
         <if test="age !=null and age != ''">
             and bo.age= #{age}
         </if>

service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java

@@ -163,10 +163,6 @@ public class PayFeeConfirmCmd extends AbstractServiceCmdListener {
             if (flag < 1) {
                 throw new CmdException("更新微信派单池信息失败");
             }
-        }
-        //修改报修派单状态
-        if (feeAttrDtos != null && feeAttrDtos.size() > 0) {
-
             RepairUserDto repairUserDto = new RepairUserDto();
             repairUserDto.setRepairId(feeAttrDtos.get(0).getValue());
             repairUserDto.setState(RepairUserDto.STATE_PAY_FEE);
@@ -181,7 +177,7 @@ public class PayFeeConfirmCmd extends AbstractServiceCmdListener {
             DecimalFormat df = new DecimalFormat("0.00");
             BigDecimal payment_amount = new BigDecimal(paramObj.getString("receivableAmount"));
             repairUserPo.setContext("已支付" + df.format(payment_amount) + "元");
-            int flag = repairUserNewV1InnerServiceSMOImpl.updateRepairUserNew(repairUserPo);
+            flag = repairUserNewV1InnerServiceSMOImpl.updateRepairUserNew(repairUserPo);
             if (flag < 1) {
                 throw new CmdException("更新微信派单池信息失败");
             }
@@ -218,7 +214,7 @@ public class PayFeeConfirmCmd extends AbstractServiceCmdListener {
             //List<ComputeDiscountDto> computeDiscountDtos = (List<ComputeDiscountDto>) paramObj.get("computeDiscountDtos");
             JSONArray computeDiscountDtos = paramObj.getJSONArray("computeDiscountDtos");
             ComputeDiscountDto computeDiscountDto = null;
-            if (computeDiscountDtos != null && computeDiscountDtos.size()> 0) {
+            if (computeDiscountDtos != null && computeDiscountDtos.size() > 0) {
                 for (int accountIndex = 0; accountIndex < computeDiscountDtos.size(); accountIndex++) {
                     computeDiscountDto = BeanConvertUtil.covertBean(computeDiscountDtos.getJSONObject(accountIndex), ComputeDiscountDto.class);
                     if (!StringUtil.isEmpty(computeDiscountDto.getArdId())) {