优化折扣

java110-bean/src/main/java/com/java110/po/payFeeDetailDiscount/PayFeeDetailDiscountPo.java

@@ -1,60 +1,72 @@
 package com.java110.po.payFeeDetailDiscount;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class PayFeeDetailDiscountPo implements Serializable {
 
     private String detailDiscountId;
-private String discountPrice;
-private String detailId;
-private String remark;
-private String communityId;
-private String discountId;
-private String feeId;
-public String getDetailDiscountId() {
+    private String discountPrice;
+    private String detailId;
+    private String remark;
+    private String communityId;
+    private String discountId;
+    private String feeId;
+
+    public String getDetailDiscountId() {
         return detailDiscountId;
     }
-public void setDetailDiscountId(String detailDiscountId) {
+
+    public void setDetailDiscountId(String detailDiscountId) {
         this.detailDiscountId = detailDiscountId;
     }
-public String getDiscountPrice() {
+
+    public String getDiscountPrice() {
         return discountPrice;
     }
-public void setDiscountPrice(String discountPrice) {
+
+    public void setDiscountPrice(String discountPrice) {
         this.discountPrice = discountPrice;
     }
-public String getDetailId() {
+
+    public String getDetailId() {
         return detailId;
     }
-public void setDetailId(String detailId) {
+
+    public void setDetailId(String detailId) {
         this.detailId = detailId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getDiscountId() {
+
+    public String getDiscountId() {
         return discountId;
     }
-public void setDiscountId(String discountId) {
+
+    public void setDiscountId(String discountId) {
         this.discountId = discountId;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
 
 
-
 }

java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java

@@ -1219,8 +1219,8 @@ public class BusinessTypeConstant {
      */
     public static final String BUSINESS_TYPE_DELETE_WORKFLOW_STEP_STAFF="580300050001";
     /**
-     *  保存工作流节点 处理员工
-     *  3保存
+     *  保存工作流节点 处理员工 ORDER_FEE_SERVICE_URL
+     *  3保存 feeServiceTopic
      */
     public static final String BUSINESS_TYPE_SAVE_DETAIL_DISCOUNT_INFO="641100030001";
 

service-api/src/main/java/com/java110/api/bmo/fee/IFeeBMO.java

@@ -49,6 +49,9 @@ public interface IFeeBMO extends IApiBaseBMO {
      */
     public JSONObject modifyFee(JSONObject paramInJson, DataFlowContext dataFlowContext);
 
+
+
+
     /**
      * 添加费用明细信息
      *

service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java

@@ -167,7 +167,7 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
         paramInJson.put("feeInfo", feeDto);
 
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailPo.class.getSimpleName(), businessFeeDetail);
-
+        paramInJson.put("detailId", businessFeeDetail.getString("detailId"));
         feeReceiptDetailPo.setAmount(businessFeeDetail.getString("receivedAmount"));
         feeReceiptDetailPo.setCommunityId(feeDto.getCommunityId());
         feeReceiptDetailPo.setCycle(businessFeeDetail.getString("cycles"));
@@ -664,9 +664,9 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
 
         String time = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A);
 
-        if(paramInJson.containsKey("feeEndDate")){
+        if (paramInJson.containsKey("feeEndDate")) {
             time = paramInJson.getString("feeEndDate");
-        }else if (paramInJson.containsKey("startTime")) {
+        } else if (paramInJson.containsKey("startTime")) {
             time = paramInJson.getString("startTime");
         }
         JSONObject business = JSONObject.parseObject("{\"datas\":{}}");

service-api/src/main/java/com/java110/api/bmo/payFeeDetailDiscount/IPayFeeDetailDiscountBMO.java

@@ -13,7 +13,7 @@ public interface IPayFeeDetailDiscountBMO extends IApiBaseBMO {
      * @param dataFlowContext
      * @return
      */
-     void addPayFeeDetailDiscount(JSONObject paramInJson, DataFlowContext dataFlowContext);
+    JSONObject addPayFeeDetailDiscount(JSONObject paramInJson,JSONObject discountJson, DataFlowContext dataFlowContext);
 
     /**
      * 添加缴费优惠信息

service-api/src/main/java/com/java110/api/bmo/payFeeDetailDiscount/impl/PayFeeDetailDiscountBMOImpl.java

@@ -5,8 +5,10 @@ import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.payFeeDetailDiscount.IPayFeeDetailDiscountBMO;
 import com.java110.core.context.DataFlowContext;
 import com.java110.intf.fee.IPayFeeDetailDiscountInnerServiceSMO;
+import com.java110.po.fee.PayFeePo;
 import com.java110.po.payFeeDetailDiscount.PayFeeDetailDiscountPo;
 import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,11 +26,22 @@ public class PayFeeDetailDiscountBMOImpl extends ApiBaseBMO implements IPayFeeDe
      * @param dataFlowContext 数据上下文
      * @return 订单服务能够接受的报文
      */
-    public void addPayFeeDetailDiscount(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+    public JSONObject addPayFeeDetailDiscount(JSONObject paramInJson, JSONObject discountJson, DataFlowContext dataFlowContext) {
+        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_DETAIL_DISCOUNT_INFO);
+        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+        JSONObject businessFee = new JSONObject();
+        businessFee.put("detailDiscountId", "-1");
+        businessFee.put("discountPrice", discountJson.getString("discountPrice"));
+        businessFee.put("discountId", discountJson.getString("discountId"));
+        businessFee.put("detailId", paramInJson.getString("detailId"));
+        businessFee.put("communityId", paramInJson.getString("communityId"));
+        businessFee.put("feeId", paramInJson.getString("feeId"));
+        //businessFee.putAll(feeMap);
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailDiscountPo.class.getSimpleName(), businessFee);
+        return business;
 
-        paramInJson.put("detailDiscountId", "-1");
-        PayFeeDetailDiscountPo payFeeDetailDiscountPo = BeanConvertUtil.covertBean(paramInJson, PayFeeDetailDiscountPo.class);
-        super.insert(dataFlowContext, payFeeDetailDiscountPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_DETAIL_DISCOUNT_INFO);
     }
 
 

service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java

@@ -3,6 +3,7 @@ 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;
@@ -13,13 +14,9 @@ import com.java110.dto.fee.FeeDto;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.repair.RepairDto;
 import com.java110.entity.center.AppService;
-import com.java110.intf.fee.IFeeReceiptDetailInnerServiceSMO;
 import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
-import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
-import com.java110.intf.fee.IFeeInnerServiceSMO;
-import com.java110.intf.fee.IFeeReceiptInnerServiceSMO;
+import com.java110.intf.fee.*;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.po.car.OwnerCarPo;
 import com.java110.po.feeReceipt.FeeReceiptPo;
@@ -82,6 +79,9 @@ public class PayFeeListener extends AbstractServiceApiDataFlowListener {
     @Autowired
     private IFeeReceiptDetailInnerServiceSMO feeReceiptDetailInnerServiceSMOImpl;
 
+    @Autowired
+    private IPayFeeDetailDiscountBMO payFeeDetailDiscountBMOImpl;
+
 
     @Override
     public String getServiceCode() {
@@ -117,6 +117,13 @@ public class PayFeeListener extends AbstractServiceApiDataFlowListener {
         businesses.add(feeBMOImpl.addFeeDetail(paramObj, dataFlowContext, feeReceiptDetailPo, feeReceiptPo));
         businesses.add(feeBMOImpl.modifyFee(paramObj, dataFlowContext));
 
+        //折扣管理
+        if (paramObj.containsKey("selectDiscount")) {
+            JSONArray selectDiscounts = paramObj.getJSONArray("selectDiscount");
+            for (int discountIndex = 0; discountIndex < selectDiscounts.size(); discountIndex++) {
+                businesses.add(payFeeDetailDiscountBMOImpl.addPayFeeDetailDiscount(paramObj, selectDiscounts.getJSONObject(discountIndex), dataFlowContext));
+            }
+        }
 
         //为停车费单独处理
         if (paramObj.containsKey("carPayerObjType") && FeeDto.PAYER_OBJ_TYPE_CAR.equals(paramObj.getString("carPayerObjType"))) {
@@ -174,6 +181,7 @@ public class PayFeeListener extends AbstractServiceApiDataFlowListener {
         dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailPo));
     }
 
+
     /**
      * 数据校验
      *

service-api/src/main/java/com/java110/api/listener/payFeeDetailDiscount/SavePayFeeDetailDiscountListener.java

@@ -33,7 +33,7 @@ public class SavePayFeeDetailDiscountListener extends AbstractServiceApiPlusList
 
     @Override
     protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-        payFeeDetailDiscountBMOImpl.addPayFeeDetailDiscount(reqJson, context);
+        //payFeeDetailDiscountBMOImpl.addPayFeeDetailDiscount(reqJson, context);
     }
 
     @Override