|
|
@@ -1,64 +1,52 @@
|
|
|
-package com.java110.api.listener.fee;
|
|
|
+package com.java110.fee.cmd.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.annotation.Java110Cmd;
|
|
|
+import com.java110.core.annotation.Java110Transactional;
|
|
|
import com.java110.core.context.DataFlowContext;
|
|
|
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
|
|
|
+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.core.log.LoggerFactory;
|
|
|
+import com.java110.core.smo.IComputeFeeSMO;
|
|
|
import com.java110.dto.app.AppDto;
|
|
|
import com.java110.dto.fee.FeeAttrDto;
|
|
|
import com.java110.dto.fee.FeeDetailDto;
|
|
|
+import com.java110.dto.fee.FeeDto;
|
|
|
import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
|
|
|
+import com.java110.dto.owner.OwnerDto;
|
|
|
import com.java110.dto.repair.RepairDto;
|
|
|
import com.java110.dto.repair.RepairUserDto;
|
|
|
-import com.java110.entity.center.AppService;
|
|
|
-import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
|
|
|
-import com.java110.intf.community.IRepairInnerServiceSMO;
|
|
|
-import com.java110.intf.community.IRepairUserInnerServiceSMO;
|
|
|
-import com.java110.intf.community.IRoomInnerServiceSMO;
|
|
|
+import com.java110.intf.community.*;
|
|
|
import com.java110.intf.fee.*;
|
|
|
+import com.java110.po.fee.PayFeeDetailPo;
|
|
|
+import com.java110.po.fee.PayFeePo;
|
|
|
import com.java110.po.feeReceipt.FeeReceiptPo;
|
|
|
import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
|
|
|
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.constant.ResponseConstant;
|
|
|
+import com.java110.utils.exception.CmdException;
|
|
|
+import com.java110.utils.exception.ListenerExecuteException;
|
|
|
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 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.ArrayList;
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
-/**
|
|
|
- * @ClassName payOweFeeListener
|
|
|
- * @Description TODO 缴费侦听
|
|
|
- * @Author wuxw
|
|
|
- * @Date 2019/6/3 13:46
|
|
|
- * @Version 1.0
|
|
|
- * add by wuxw 2019/6/3
|
|
|
- **/
|
|
|
-@Java110Listener("payOweFeeListener")
|
|
|
-public class PayOweFeeListener extends AbstractServiceApiDataFlowListener {
|
|
|
-
|
|
|
- private static Logger logger = LoggerFactory.getLogger(PayOweFeeListener.class);
|
|
|
|
|
|
- @Autowired
|
|
|
- private IFeeBMO feeBMOImpl;
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.text.ParseException;
|
|
|
+import java.util.*;
|
|
|
|
|
|
+@Java110Cmd(serviceCode = "fee.payOweFee")
|
|
|
+public class PayOweFeeCmd extends Cmd {
|
|
|
+ private static Logger logger = LoggerFactory.getLogger(PayOweFeeCmd.class);
|
|
|
@Autowired
|
|
|
private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
|
|
|
@Autowired
|
|
|
@@ -85,40 +73,52 @@ public class PayOweFeeListener extends AbstractServiceApiDataFlowListener {
|
|
|
@Autowired
|
|
|
private IRepairInnerServiceSMO repairInnerServiceSMO;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
|
|
|
|
|
|
- @Override
|
|
|
- public String getServiceCode() {
|
|
|
- return ServiceCodeConstant.SERVICE_CODE_PAY_OWE_FEE;
|
|
|
- }
|
|
|
+ @Autowired
|
|
|
+ private IPayFeeDetailV1InnerServiceSMO payFeeDetailV1InnerServiceSMOImpl;
|
|
|
+
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IRepairPoolV1InnerServiceSMO repairPoolV1InnerServiceSMOImpl;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IRepairUserV1InnerServiceSMO repairUserV1InnerServiceSMOImpl;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IComputeFeeSMO computeFeeSMOImpl;
|
|
|
|
|
|
- @Override
|
|
|
- public HttpMethod getHttpMethod() {
|
|
|
- return HttpMethod.POST;
|
|
|
- }
|
|
|
|
|
|
@Override
|
|
|
- public void soService(ServiceDataFlowEvent event) {
|
|
|
+ public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
|
|
|
|
|
|
- logger.debug("ServiceDataFlowEvent : {}", event);
|
|
|
+ Assert.hasKey(reqJson, "fees", "请求报文中未包含费用信息");
|
|
|
|
|
|
- DataFlowContext dataFlowContext = event.getDataFlowContext();
|
|
|
- AppService service = event.getAppService();
|
|
|
+ JSONArray fees = reqJson.getJSONArray("fees");
|
|
|
|
|
|
- String paramIn = dataFlowContext.getReqData();
|
|
|
+ JSONObject feeObject = null;
|
|
|
|
|
|
- //校验数据
|
|
|
- validate(paramIn);
|
|
|
- JSONObject paramObj = JSONObject.parseObject(paramIn);
|
|
|
+ for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
|
|
|
+ feeObject = fees.getJSONObject(feeIndex);
|
|
|
+ Assert.hasKeyAndValue(feeObject, "feeId", "未包含费用信息");
|
|
|
+ Assert.hasKeyAndValue(feeObject, "startTime", "未包含开始时间");
|
|
|
+ Assert.hasKeyAndValue(feeObject, "endTime", "未包含结束时间");
|
|
|
+ Assert.hasKeyAndValue(feeObject, "receivedAmount", "未包含实收金额");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ @Java110Transactional
|
|
|
+ public void doCmd(CmdEvent event, ICmdDataFlowContext dataFlowContext, JSONObject paramObj) throws CmdException, ParseException {
|
|
|
logger.info("======欠费缴费返回======：" + JSONArray.toJSONString(paramObj));
|
|
|
- HttpHeaders header = new HttpHeaders();
|
|
|
- dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
|
|
|
- JSONArray businesses = new JSONArray();
|
|
|
+
|
|
|
//添加单元信息
|
|
|
List<FeeReceiptPo> feeReceiptPos = new ArrayList<>();
|
|
|
List<FeeReceiptDetailPo> feeReceiptDetailPos = new ArrayList<>();
|
|
|
JSONArray fees = paramObj.getJSONArray("fees");
|
|
|
JSONObject feeObj = null;
|
|
|
- String appId = event.getDataFlowContext().getAppId();
|
|
|
+ String appId = dataFlowContext.getReqHeaders().get("app-id");
|
|
|
|
|
|
for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
|
|
|
feeObj = fees.getJSONObject(feeIndex);
|
|
|
@@ -130,14 +130,7 @@ public class PayOweFeeListener extends AbstractServiceApiDataFlowListener {
|
|
|
feeObj.put("remark", "线上公众号支付");
|
|
|
}
|
|
|
|
|
|
- getFeeReceiptDetailPo(dataFlowContext, feeObj, businesses, feeReceiptDetailPos, feeReceiptPos);
|
|
|
- }
|
|
|
-
|
|
|
- ResponseEntity<String> responseEntity = feeBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
|
|
|
- dataFlowContext.setResponseEntity(responseEntity);
|
|
|
-
|
|
|
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
|
|
|
- return;
|
|
|
+ getFeeReceiptDetailPo(dataFlowContext, feeObj, feeReceiptDetailPos, feeReceiptPos);
|
|
|
}
|
|
|
|
|
|
//这里只是写入 收据表，暂不考虑 事务一致性问题，就算写入失败 也只是影响 收据打印，如果 贵公司对 收据要求 比较高，不能有失败的情况 请加入事务管理
|
|
|
@@ -166,11 +159,12 @@ public class PayOweFeeListener extends AbstractServiceApiDataFlowListener {
|
|
|
dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos));
|
|
|
}
|
|
|
|
|
|
- private void getFeeReceiptDetailPo(DataFlowContext dataFlowContext, JSONObject paramObj, JSONArray businesses, List<FeeReceiptDetailPo> feeReceiptDetailPos, List<FeeReceiptPo> feeReceiptPos) {
|
|
|
+ private void getFeeReceiptDetailPo(ICmdDataFlowContext dataFlowContext, JSONObject paramObj, List<FeeReceiptDetailPo> feeReceiptDetailPos, List<FeeReceiptPo> feeReceiptPos) {
|
|
|
+ int flag = 0;
|
|
|
if (!paramObj.containsKey("primeRate")) {
|
|
|
paramObj.put("primeRate", "6");
|
|
|
}
|
|
|
- String appId = dataFlowContext.getAppId();
|
|
|
+ String appId = dataFlowContext.getReqHeaders().get("app-id");
|
|
|
logger.info("======支付方式======：" + appId + "+======+" + paramObj.containsKey("primeRate") + "======:" + JSONArray.toJSONString(dataFlowContext));
|
|
|
if (AppDto.OWNER_WECHAT_PAY.equals(appId)
|
|
|
&& FeeDetailDto.PRIME_REATE_WECHAT.equals(paramObj.getString("primeRate"))) { //微信支付（欠费缴费无法区分小程序还是微信公众号）
|
|
|
@@ -180,8 +174,8 @@ public class PayOweFeeListener extends AbstractServiceApiDataFlowListener {
|
|
|
paramObj.put("remark", "线上小程序支付");
|
|
|
}
|
|
|
paramObj.put("state", "1400");
|
|
|
- businesses.add(feeBMOImpl.addOweFeeDetail(paramObj, dataFlowContext, feeReceiptDetailPos, feeReceiptPos));
|
|
|
- businesses.add(feeBMOImpl.modifyOweFee(paramObj, dataFlowContext));
|
|
|
+ addOweFeeDetail(paramObj, dataFlowContext, feeReceiptDetailPos, feeReceiptPos);
|
|
|
+ modifyOweFee(paramObj, dataFlowContext);
|
|
|
|
|
|
//判断是否有派单属性ID
|
|
|
FeeAttrDto feeAttrDto = new FeeAttrDto();
|
|
|
@@ -192,23 +186,19 @@ public class PayOweFeeListener extends AbstractServiceApiDataFlowListener {
|
|
|
|
|
|
//修改 派单状态
|
|
|
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);
|
|
|
+ flag = repairPoolV1InnerServiceSMOImpl.updateRepairPoolNew(repairPoolPo);
|
|
|
+ if(flag < 1){
|
|
|
+ throw new CmdException("修改失败");
|
|
|
+ }
|
|
|
}
|
|
|
//修改 派单流程状态
|
|
|
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);
|
|
|
+
|
|
|
RepairDto repairDto = new RepairDto();
|
|
|
repairDto.setRepairId(feeAttrDtos.get(0).getValue());
|
|
|
//查询报修记录
|
|
|
@@ -230,10 +220,6 @@ public class PayOweFeeListener extends AbstractServiceApiDataFlowListener {
|
|
|
repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
|
|
|
repairUserPo.setContext("已支付" + paramObj.getString("receivedAmount") + "元");
|
|
|
//新增待评价状态
|
|
|
- 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 + 4);
|
|
|
- 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());
|
|
|
@@ -248,77 +234,132 @@ public class PayOweFeeListener extends AbstractServiceApiDataFlowListener {
|
|
|
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));
|
|
|
- businesses.add(object);
|
|
|
+ flag = repairUserV1InnerServiceSMOImpl.saveRepairUserNew(repairUserPo);
|
|
|
+ if(flag < 1){
|
|
|
+ throw new CmdException("修改失败");
|
|
|
+ }
|
|
|
} else { //如果是员工代客报修或电话报修，状态就变成已支付
|
|
|
repairUserPo.setState(RepairUserDto.STATE_FINISH_PAY_FEE);
|
|
|
//如果是已支付状态，就更新结束时间
|
|
|
repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
|
|
|
repairUserPo.setContext("已支付" + paramObj.getString("receivedAmount") + "元");
|
|
|
+ flag = repairUserV1InnerServiceSMOImpl.updateRepairUserNew(repairUserPo);
|
|
|
+ if(flag < 1){
|
|
|
+ throw new CmdException("修改失败");
|
|
|
+ }
|
|
|
}
|
|
|
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(RepairUserPo.class.getSimpleName(), BeanConvertUtil.beanCovertMap(repairUserPo));
|
|
|
- businesses.add(business);
|
|
|
}
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
- * 数据校验
|
|
|
+ * 修改费用信息
|
|
|
*
|
|
|
- * @param paramIn "communityId": "7020181217000001",
|
|
|
- * "memberId": "3456789",
|
|
|
- * "memberTypeCd": "390001200001"
|
|
|
+ * @param paramInJson 接口调用放传入入参
|
|
|
+ * @param dataFlowContext 数据上下文
|
|
|
+ * @return 订单服务能够接受的报文
|
|
|
*/
|
|
|
- private void validate(String paramIn) {
|
|
|
- Assert.jsonObjectHaveKey(paramIn, "communityId", "请求报文中未包含communityId节点");
|
|
|
- JSONObject reqJson = JSONObject.parseObject(paramIn);
|
|
|
- Assert.hasKey(reqJson, "fees", "请求报文中未包含费用信息");
|
|
|
-
|
|
|
- JSONArray fees = reqJson.getJSONArray("fees");
|
|
|
-
|
|
|
- JSONObject feeObject = null;
|
|
|
-
|
|
|
- for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
|
|
|
- feeObject = fees.getJSONObject(feeIndex);
|
|
|
- Assert.hasKeyAndValue(feeObject, "feeId", "未包含费用信息");
|
|
|
- Assert.hasKeyAndValue(feeObject, "startTime", "未包含开始时间");
|
|
|
- Assert.hasKeyAndValue(feeObject, "endTime", "未包含结束时间");
|
|
|
- Assert.hasKeyAndValue(feeObject, "receivedAmount", "未包含实收金额");
|
|
|
+ public void modifyOweFee(JSONObject paramInJson, ICmdDataFlowContext dataFlowContext) {
|
|
|
+
|
|
|
+ JSONObject businessFee = new JSONObject();
|
|
|
+ FeeDto feeInfo = (FeeDto) paramInJson.get("feeInfo");
|
|
|
+ Map feeMap = BeanConvertUtil.beanCovertMap(feeInfo);
|
|
|
+ feeMap.put("startTime", DateUtil.getFormatTimeString(feeInfo.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
|
|
|
+ feeMap.put("endTime", paramInJson.getString("endTime"));
|
|
|
+ feeMap.put("cycles", paramInJson.getString("cycles"));
|
|
|
+ feeMap.put("configEndTime", feeInfo.getConfigEndTime());
|
|
|
+ if (FeeDto.FEE_FLAG_ONCE.equals(feeInfo.getFeeFlag())) { //缴费结束
|
|
|
+ feeMap.put("state", FeeDto.STATE_FINISH);
|
|
|
+ }
|
|
|
+ Date maxEndTime = feeInfo.getConfigEndTime();
|
|
|
+ if (!FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())) {
|
|
|
+ maxEndTime = feeInfo.getDeadlineTime();
|
|
|
+ }
|
|
|
+ if(maxEndTime != null) { //这里数据问题的情况下
|
|
|
+ Date endTime = DateUtil.getDateFromStringA(paramInJson.getString("endTime"));
|
|
|
+ if (endTime.getTime() >= maxEndTime.getTime()) {
|
|
|
+ feeMap.put("state", FeeDto.STATE_FINISH);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+ businessFee.putAll(feeMap);
|
|
|
+ PayFeePo payFeePo = BeanConvertUtil.covertBean(businessFee,PayFeePo.class);
|
|
|
+ int flag = payFeeV1InnerServiceSMOImpl.savePayFee(payFeePo);
|
|
|
+ if (flag < 1) {
|
|
|
+ throw new CmdException("保存失败");
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- @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 addOweFeeDetail(JSONObject paramInJson, ICmdDataFlowContext dataFlowContext,
|
|
|
+ List<FeeReceiptDetailPo> feeReceiptDetailPos,
|
|
|
+ List<FeeReceiptPo> feeReceiptPos) {
|
|
|
+
|
|
|
+ JSONObject businessFeeDetail = new JSONObject();
|
|
|
+ businessFeeDetail.putAll(paramInJson);
|
|
|
+ businessFeeDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
|
|
|
+ businessFeeDetail.put("primeRate", paramInJson.getString("primeRate"));
|
|
|
+ //计算 应收金额
|
|
|
+ FeeDto feeDto = new FeeDto();
|
|
|
+ feeDto.setFeeId(paramInJson.getString("feeId"));
|
|
|
+ feeDto.setCommunityId(paramInJson.getString("communityId"));
|
|
|
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
|
|
|
+ if (feeDtos == null || feeDtos.size() != 1) {
|
|
|
+ throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "查询费用信息失败，未查到数据或查到多条数据");
|
|
|
+ }
|
|
|
+ if (!businessFeeDetail.containsKey("state") || StringUtil.isEmpty(businessFeeDetail.getString("state"))) {
|
|
|
+ businessFeeDetail.put("state", "1400");
|
|
|
+ }
|
|
|
+ feeDto = feeDtos.get(0);
|
|
|
+ businessFeeDetail.put("startTime", paramInJson.getString("startTime"));
|
|
|
+ BigDecimal cycles = null;
|
|
|
+ Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
|
|
|
+ BigDecimal feePrice = new BigDecimal(feePriceAll.get("feePrice").toString());
|
|
|
+ Date endTime = feeDto.getEndTime();
|
|
|
+ Calendar endCalender = Calendar.getInstance();
|
|
|
+ endCalender.setTime(endTime);
|
|
|
+ BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
|
|
|
+ cycles = receivedAmount.divide(feePrice, 4, BigDecimal.ROUND_HALF_EVEN);
|
|
|
+ businessFeeDetail.put("cycles", cycles.doubleValue());
|
|
|
+ businessFeeDetail.put("receivableAmount", paramInJson.getString("receivedAmount"));
|
|
|
+ businessFeeDetail.put("receivedAmount", paramInJson.getString("receivedAmount"));
|
|
|
+ businessFeeDetail.put("endTime", paramInJson.getString("endTime"));
|
|
|
+ paramInJson.put("feeInfo", feeDto);
|
|
|
+ paramInJson.put("cycles", cycles.doubleValue());
|
|
|
+ PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(businessFeeDetail, PayFeeDetailPo.class);
|
|
|
+ int flag = payFeeDetailV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
|
|
|
+
|
|
|
+ if (flag < 1) {
|
|
|
+ throw new CmdException("保存明细失败");
|
|
|
+ }
|
|
|
|
|
|
- public void setRoomInnerServiceSMOImpl(IRoomInnerServiceSMO roomInnerServiceSMOImpl) {
|
|
|
- this.roomInnerServiceSMOImpl = roomInnerServiceSMOImpl;
|
|
|
+ paramInJson.put("detailId", businessFeeDetail.getString("detailId"));
|
|
|
+ FeeReceiptPo feeReceiptPo = new FeeReceiptPo();
|
|
|
+ FeeReceiptDetailPo feeReceiptDetailPo = new FeeReceiptDetailPo();
|
|
|
+ feeReceiptDetailPo.setAmount(businessFeeDetail.getString("receivedAmount"));
|
|
|
+ feeReceiptDetailPo.setCommunityId(feeDto.getCommunityId());
|
|
|
+ feeReceiptDetailPo.setCycle(businessFeeDetail.getString("cycles"));
|
|
|
+ feeReceiptDetailPo.setDetailId(businessFeeDetail.getString("detailId"));
|
|
|
+ feeReceiptDetailPo.setEndTime(businessFeeDetail.getString("endTime"));
|
|
|
+ feeReceiptDetailPo.setFeeId(feeDto.getFeeId());
|
|
|
+ feeReceiptDetailPo.setFeeName(StringUtil.isEmpty(feeDto.getImportFeeName()) ? feeDto.getFeeName() : feeDto.getImportFeeName());
|
|
|
+ feeReceiptDetailPo.setStartTime(businessFeeDetail.getString("startTime"));
|
|
|
+ feeReceiptDetailPo.setReceiptId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_receiptId));
|
|
|
+
|
|
|
+ computeFeeSMOImpl.freshFeeReceiptDetail(feeDto, feeReceiptDetailPo);
|
|
|
+ //查询业主信息
|
|
|
+ OwnerDto ownerDto = computeFeeSMOImpl.getFeeOwnerDto(feeDto);
|
|
|
+
|
|
|
+ feeReceiptDetailPos.add(feeReceiptDetailPo);
|
|
|
+ feeReceiptPo.setAmount(feeReceiptDetailPo.getAmount());
|
|
|
+ feeReceiptPo.setCommunityId(feeReceiptDetailPo.getCommunityId());
|
|
|
+ feeReceiptPo.setReceiptId(feeReceiptDetailPo.getReceiptId());
|
|
|
+ feeReceiptPo.setObjType(feeDto.getPayerObjType());
|
|
|
+ feeReceiptPo.setObjId(feeDto.getPayerObjId());
|
|
|
+ feeReceiptPo.setObjName(computeFeeSMOImpl.getFeeObjName(feeDto));
|
|
|
+ feeReceiptPo.setPayObjId(ownerDto.getOwnerId());
|
|
|
+ feeReceiptPo.setPayObjName(ownerDto.getName());
|
|
|
+ feeReceiptPos.add(feeReceiptPo);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
}
|
java110