手机支付加入 优惠金额

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

@@ -418,10 +418,13 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
         BigDecimal receivableAmount = feePrice;
         BigDecimal cycles = new BigDecimal(Double.parseDouble(paramInJson.getString("cycles")));
         double tmpReceivableAmount = cycles.multiply(receivableAmount).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
-
+        double discountPrice = paramInJson.getDouble("discountPrice");
         businessFeeDetail.put("receivableAmount", tmpReceivableAmount);
+        businessFeeDetail.put("receivedAmount",
+                new BigDecimal(tmpReceivableAmount).subtract(new BigDecimal(discountPrice)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailPo.class.getSimpleName(), businessFeeDetail);
         paramInJson.put("receivableAmount", tmpReceivableAmount);
+        paramInJson.put("receivedAmount", businessFeeDetail.getString("receivedAmount"));
         return business;
     }
 

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

@@ -3,17 +3,21 @@ 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.intf.fee.IFeeConfigInnerServiceSMO;
-import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.dto.fee.FeeDetailDto;
+import com.java110.dto.feeDiscount.ComputeDiscountDto;
+import com.java110.entity.center.AppService;
+import com.java110.entity.order.Orders;
 import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.fee.IFeeDiscountInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
 import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
-import com.java110.entity.center.AppService;
-import com.java110.entity.order.Orders;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.util.Assert;
@@ -24,6 +28,9 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * @ClassName PayFeeListener
  * @Description TODO 预交费侦听
@@ -54,6 +61,12 @@ public class PayFeePreListener extends AbstractServiceApiDataFlowListener {
     @Autowired
     private ISmallWeChatInnerServiceSMO smallWeChatInnerServiceSMOImpl;
 
+    @Autowired
+    private IFeeDiscountInnerServiceSMO feeDiscountInnerServiceSMOImpl;
+
+
+    @Autowired
+    private IPayFeeDetailDiscountBMO payFeeDetailDiscountBMOImpl;
 
     @Override
     public String getServiceCode() {
@@ -77,15 +90,24 @@ public class PayFeePreListener extends AbstractServiceApiDataFlowListener {
 
         //校验数据
         validate(paramIn);
-        JSONObject paramObj = JSONObject.parseObject(paramIn)   ;
+        JSONObject paramObj = JSONObject.parseObject(paramIn);
 
         dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
         JSONArray businesses = new JSONArray();
+        //判断是否有折扣情况
+        judgeDiscount(paramObj);
 
         //添加单元信息
         businesses.add(feeBMOImpl.addFeePreDetail(paramObj, dataFlowContext));
         businesses.add(feeBMOImpl.modifyPreFee(paramObj, dataFlowContext));
-        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.ORDER_PROCESS,Orders.ORDER_PROCESS_ORDER_PRE_SUBMIT);
+
+        double discountPrice = paramObj.getDouble("discountPrice");
+        if (discountPrice > 0) {
+            addDiscount(paramObj, businesses, dataFlowContext);
+        }
+
+
+        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.ORDER_PROCESS, Orders.ORDER_PROCESS_ORDER_PRE_SUBMIT);
         ResponseEntity<String> responseEntity = feeBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             dataFlowContext.setResponseEntity(responseEntity);
@@ -93,11 +115,56 @@ public class PayFeePreListener extends AbstractServiceApiDataFlowListener {
         }
 
         JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+        //这里调整为实收金额
         paramOut.put("receivableAmount", paramObj.getString("receivableAmount"));
+        paramOut.put("receivedAmount", paramObj.getString("receivedAmount"));
         responseEntity = new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
         dataFlowContext.setResponseEntity(responseEntity);
     }
 
+    private void judgeDiscount(JSONObject paramObj) {
+        FeeDetailDto feeDetailDto = new FeeDetailDto();
+        feeDetailDto.setCommunityId(paramObj.getString("communityId"));
+        feeDetailDto.setFeeId(paramObj.getString("feeId"));
+        feeDetailDto.setCycles(paramObj.getString("cycles"));
+        feeDetailDto.setRow(1);
+        feeDetailDto.setPage(20);
+        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.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+        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);
+            }
+        }
+    }
+
     /**
      * 数据校验
      *
@@ -119,6 +186,7 @@ public class PayFeePreListener extends AbstractServiceApiDataFlowListener {
         Assert.hasLength(paramInObj.getString("feeId"), "费用ID不能为空");
         Assert.hasLength(paramInObj.getString("appId"), "appId不能为空");
 
+
     }
 
     @Override

service-fee/src/main/java/com/java110/fee/smo/impl/PayFeeDetailDiscountInnerServiceSMOImpl.java

@@ -47,6 +47,8 @@ public class PayFeeDetailDiscountInnerServiceSMOImpl extends BaseServiceSMO impl
         return payFeeDetailDiscounts;
     }
 
+
+
     /**
      * 从用户列表中查询用户，将用户中的信息 刷新到 floor对象中
      *

service-front/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java

@@ -82,13 +82,13 @@ public class ToPaySMOImpl extends AppAbstractComponentSMO implements IToPaySMO {
         }
         JSONObject orderInfo = JSONObject.parseObject(responseEntity.getBody().toString());
         String orderId = orderInfo.getString("oId");
-        double money = Double.parseDouble(orderInfo.getString("receivableAmount"));
+        double money = Double.parseDouble(orderInfo.getString("receivedAmount"));
         String appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
         if (AppDto.WECHAT_OWNER_APP_ID.equals(pd.getAppId())) {
             appType = OwnerAppUserDto.APP_TYPE_WECHAT;
-        }else if(AppDto.WECHAT_MINA_OWNER_APP_ID.equals(pd.getAppId())){
+        } else if (AppDto.WECHAT_MINA_OWNER_APP_ID.equals(pd.getAppId())) {
             appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
-        }else{
+        } else {
             appType = OwnerAppUserDto.APP_TYPE_APP;
         }
         Map tmpParamIn = new HashMap();