优化 车辆缴费

java110-bean/src/main/java/com/java110/dto/feeReceipt/FeeReceiptDto.java

@@ -31,6 +31,7 @@ public class FeeReceiptDto extends PageDto implements Serializable {
     private String payObjName;
     private String qstartTime;
     private String qendTime;
+    private String []detailIds;
 
     //商户名称
     private String storeName;
@@ -190,4 +191,12 @@ public class FeeReceiptDto extends PageDto implements Serializable {
     public void setQendTime(String qendTime) {
         this.qendTime = qendTime;
     }
+
+    public String[] getDetailIds() {
+        return detailIds;
+    }
+
+    public void setDetailIds(String[] detailIds) {
+        this.detailIds = detailIds;
+    }
 }

java110-db/src/main/resources/mapper/fee/FeeReceiptServiceDaoImplMapper.xml

@@ -68,6 +68,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="detailIds !=null">
+            and frd.detail_id in
+            <foreach collection="detailIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="objType !=null and objType != ''">
             and t.obj_type= #{objType}
         </if>
@@ -316,6 +322,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="detailIds !=null">
+            and frd.detail_id in
+            <foreach collection="detailIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="objType !=null and objType != ''">
             and t.obj_type= #{objType}
         </if>

service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java

@@ -128,6 +128,7 @@ public class FeeReceiptApi {
                                                   @RequestParam(value = "payObjId", required = false) String payObjId,
                                                   @RequestParam(value = "receiptId", required = false) String receiptId,
                                                   @RequestParam(value = "receiptIds", required = false) String receiptIds,
+                                                  @RequestParam(value = "detailIds", required = false) String detailIds,
                                                   @RequestParam(value = "qstartTime", required = false) String qstartTime,
                                                   @RequestParam(value = "qendTime", required = false) String qendTime,
                                                   @RequestParam(value = "page") int page,
@@ -149,6 +150,9 @@ public class FeeReceiptApi {
         if (!StringUtil.isEmpty(receiptIds)) {
             feeReceiptDto.setReceiptIds(receiptIds.split(","));
         }
+        if (!StringUtil.isEmpty(detailIds)) {
+            feeReceiptDto.setDetailIds(detailIds.split(","));
+        }
         feeReceiptDto.setObjType(objType);
         feeReceiptDto.setObjName(roomId);
         feeReceiptDto.setObjId(objId);

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

@@ -39,6 +39,7 @@ 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 com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -150,6 +151,7 @@ public class PayBatchFeeCmd extends AbstractServiceCmdListener {
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
         JSONArray fees = reqJson.getJSONArray("fees");
         JSONObject paramInObj = null;
+        JSONArray datas = new JSONArray();
         for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
             try {
                 paramInObj = fees.getJSONObject(feeIndex);
@@ -158,7 +160,10 @@ public class PayBatchFeeCmd extends AbstractServiceCmdListener {
                 logger.error("处理异常", e);
                 throw new CmdException(e.getMessage());
             }
+            datas.add(paramInObj.getString("detailId"));
         }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(datas));
     }
 
     private void doDeal(JSONObject paramObj, String communityId, ICmdDataFlowContext cmdDataFlowContext) throws Exception {

service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerCarsCmd.java

@@ -28,7 +28,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-@Java110Cmd(serviceCode = "/contract/queryContract")
+@Java110Cmd(serviceCode = "/owner.queryOwnerCars")
 public class QueryOwnerCarsCmd extends AbstractServiceCmdListener {
 
     @Autowired