java110
2022-05-26 bdcb64f0293f27e2dfb3de12a60f6e8412cb962b
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
@@ -178,7 +178,7 @@
    @Java110Transactional
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject paramObj) throws CmdException {
        logger.debug("ServiceDataFlowEvent : {}", event);
        logger.debug("paramObj : {}", paramObj);
        PayFeePo payFeePo = null;
        String requestId = DistributedLock.getLockUUID();
        String key = this.getClass().getSimpleName() + paramObj.get("feeId");
@@ -232,16 +232,16 @@
            }
        }
        //根据明细ID 查询收据信息
//        //根据明细ID 查询收据信息
        FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
        feeReceiptDetailDto.setDetailId(paramObj.getString("detailId"));
        feeReceiptDetailDto.setCommunityId(paramObj.getString("communityId"));
        List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
        if (feeReceiptDetailDtos != null && feeReceiptDetailDtos.size() > 0) {
            cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos.get(0)));
            return;
        }
//        feeReceiptDetailDto.setCommunityId(paramObj.getString("communityId"));
//        List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
//
//        if (feeReceiptDetailDtos != null && feeReceiptDetailDtos.size() > 0) {
//            cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos.get(0)));
//            return;
//        }
        cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDto));
    }
@@ -412,10 +412,15 @@
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeDetail(JSONObject paramInJson) {
        String remark = paramInJson.getString("remark");
        if (!StringUtil.isEmpty(remark)) {
            remark = "-" + remark;
        }
        paramInJson.put("remark", "现场收银台支付" + remark);
        JSONObject businessFeeDetail = new JSONObject();
        businessFeeDetail.putAll(paramInJson);
        businessFeeDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
        paramInJson.put("detailId", businessFeeDetail.getString("detailId"));
        //支付方式
        businessFeeDetail.put("primeRate", paramInJson.getString("primeRate"));
        //计算 应收金额