java110
2020-08-02 633512b6eb2eaf3366cd18a58f3e755ce0418e27
优化支付成功修改报修但问题
5个文件已修改
69 ■■■■■ 已修改文件
java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-interface/src/main/java/com/java110/intf/fee/IFeeInnerServiceSMO.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-interface/src/main/java/com/java110/intf/order/IOrderInnerServiceSMO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/listener/fee/PayFeeConfirmListener.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
@@ -59,6 +59,8 @@
    private String paymentCycle;
    private String bId;
    private Date createTime;
@@ -347,4 +349,12 @@
    public void setPayerObjName(String payerObjName) {
        this.payerObjName = payerObjName;
    }
    public String getbId() {
        return bId;
    }
    public void setbId(String bId) {
        this.bId = bId;
    }
}
java110-interface/src/main/java/com/java110/intf/fee/IFeeInnerServiceSMO.java
@@ -33,6 +33,15 @@
    @RequestMapping(value = "/queryFees", method = RequestMethod.POST)
    List<FeeDto> queryFees(@RequestBody FeeDto feeDto);
    /**
     * <p>从Business中查询</p>
     *
     * @param feeDto 数据对象分享
     * @return FeeDto 对象数据
     */
    @RequestMapping(value = "/queryBusinessFees", method = RequestMethod.POST)
    List<FeeDto> queryBusinessFees(@RequestBody FeeDto feeDto);
    /**
java110-interface/src/main/java/com/java110/intf/order/IOrderInnerServiceSMO.java
@@ -31,6 +31,8 @@
    @RequestMapping(value = "/queryOrders", method = RequestMethod.POST)
    List<OrderDto> queryOrders(@RequestBody OrderDto orderDto);
    /**
     * 查询<p>小区楼</p>总记录数
     *
service-api/src/main/java/com/java110/api/listener/fee/PayFeeConfirmListener.java
@@ -8,10 +8,16 @@
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.order.BusinessDto;
import com.java110.dto.order.OrderDto;
import com.java110.dto.repair.RepairDto;
import com.java110.entity.center.AppService;
import com.java110.entity.order.Business;
import com.java110.entity.order.Orders;
import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.order.IOrderInnerServiceSMO;
import com.java110.po.owner.RepairPoolPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
@@ -47,6 +53,12 @@
    @Autowired
    private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
    @Autowired
    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
    @Autowired
    private IOrderInnerServiceSMO orderInnerServiceSMOImpl;
    @Override
    public String getServiceCode() {
@@ -84,11 +96,33 @@
            return;
        }
        //根据oId 查询 bId;
        BusinessDto businessDto = new BusinessDto();
        businessDto.setoId(paramObj.getString("oId"));
        businessDto.setBusinessTypeCd("600100040001");
        List<BusinessDto> businessDtos = orderInnerServiceSMOImpl.querySameOrderBusiness(businessDto);
        if(businessDtos == null ||  businessDtos.size() < 1){
            dataFlowContext.setResponseEntity(responseEntity);
            return;
        }
        FeeDto feeDto = new FeeDto();
        feeDto.setbId(businessDtos.get(0).getbId());
        List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryBusinessFees(feeDto);
        if(feeDtos == null ||  feeDtos.size() < 1){
            dataFlowContext.setResponseEntity(responseEntity);
            return;
        }
        businesses = new JSONArray();
        //判断是否有派单属性ID
        FeeAttrDto feeAttrDto = new FeeAttrDto();
        feeAttrDto.setCommunityId(paramObj.getString("communityId"));
        feeAttrDto.setFeeId(paramObj.getString("feeId"));
        feeAttrDto.setCommunityId(feeDtos.get(0).getCommunityId());
        feeAttrDto.setFeeId(feeDtos.get(0).getFeeId());
        feeAttrDto.setSpecCd(FeeAttrDto.SPEC_CD_REPAIR);
        List<FeeAttrDto> feeAttrDtos = feeAttrInnerServiceSMOImpl.queryFeeAttrs(feeAttrDto);
        //修改 派单状态
service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java
@@ -18,6 +18,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * @ClassName FloorInnerServiceSMOImpl
@@ -63,6 +64,15 @@
        return fees;
    }
    @Override
    public List<FeeDto> queryBusinessFees(FeeDto feeDto) {
        List<Map> fees = feeServiceDaoImpl.getBusinessFeeInfo(BeanConvertUtil.beanCovertMap(feeDto));
        return BeanConvertUtil.covertBeanList(fees,FeeDto.class);
    }
    /**
     * 从用户列表中查询用户,将用户中的信息 刷新到 floor对象中
     *