优化代码

wuxw

2022-01-15 e3aed650aa4e232f4583a00fc3de088276a2188b

 service-order/src/main/java/com/java110/order/smo/impl/OIdServiceSMOImpl.java

@@ -3,7 +3,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.client.RestTemplate;
import com.java110.core.context.SecureInvocation;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.app.AppDto;
import com.java110.dto.businessTableHis.BusinessTableHisDto;
import com.java110.dto.order.OrderDto;
import com.java110.dto.order.OrderItemDto;
@@ -58,23 +60,24 @@

        orderDto.setoId(GenerateCodeFactory.getOId());
        if (StringUtil.isEmpty(orderDto.getAppId())) {
            throw new IllegalArgumentException("未包含appId");
            orderDto.setAppId(AppDto.WEB_APP_ID);
        }

        if (StringUtil.isEmpty(orderDto.getExtTransactionId())) {
            throw new IllegalArgumentException("未包含交互日志");
            orderDto.setExtTransactionId(GenerateCodeFactory.getTransactionId());
        }

        if (StringUtil.isEmpty(orderDto.getRequestTime())) {
            throw new IllegalArgumentException("未包含请求时间");
            orderDto.setRequestTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT));
        }

        if (StringUtil.isEmpty(orderDto.getUserId())) {
            throw new IllegalArgumentException("未包含用户ID");
            orderDto.setUserId("-1");
        }

        //保存订单信息
        centerServiceDAOImpl.saveOrder(BeanConvertUtil.beanCovertMap(orderDto));
            centerServiceDAOImpl.saveOrder(BeanConvertUtil.beanCovertMap(orderDto));

        return new ResponseEntity<String>(JSONObject.toJSONString(orderDto), HttpStatus.OK);
    }

@@ -332,15 +335,17 @@
        business.put("bId", orderItemDto.getbId());
        centerServiceDAOImpl.saveBusiness(business);

        //通知子服务生成 business 数据
        //通知子服务生成 business 数据,如果配置NO 不通知生成 business 数据
        if (BusinessTableHisDto.ACTION_OBJ_HIS_NO.equals(businessTableHisDto.getActionObjHis())) {
            return ResultVo.createResponseEntity(ResultVo.CODE_OK, ResultVo.MSG_OK);
        }

        doNoticeServiceGeneratorBusiness(orderItemDto, businessTableHisDto);


        return ResultVo.createResponseEntity(ResultVo.CODE_OK, ResultVo.MSG_OK);
    }

    private void doNoticeServiceGeneratorBusiness(OrderItemDto orderItemDto, BusinessTableHisDto businessTableHisDto) {
        asynNotifySubServiceImpl.notifySubService(orderItemDto,businessTableHisDto);
        asynNotifySubServiceImpl.notifySubService(orderItemDto, businessTableHisDto);
    }

    /**
@@ -362,9 +367,6 @@
        info.put("oId", orderDto.getoId());
        centerServiceDAOImpl.updateOrderItem(info);

        //删除 事务日志
        //centerServiceDAOImpl.deleteUnItemLog(info);

        //完成订单
        info = new HashMap();
        info.put("finishTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -372,6 +374,27 @@
        info.put("oId", orderDto.getoId());
        centerServiceDAOImpl.updateOrder(info);

        //将c_business 修改为完成
        //完成订单项
        info = new HashMap();
        info.put("finishTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
        info.put("statusCd", "C");
        info.put("oId", orderDto.getoId());
        centerServiceDAOImpl.updateBusiness(info);

        //触发databug
        //查询 事务项
        Map orderItem = new HashMap();
        orderItem.put("oId", orderDto.getoId());
        List<Map> orderItemMaps = centerServiceDAOImpl.getOrderItems(orderItem);

        //删除 事务日志
        //centerServiceDAOImpl.deleteUnItemLog(info);

        asynNotifySubServiceImpl.notifyDatabus(orderItemMaps, orderDto);

        return ResultVo.createResponseEntity(ResultVo.CODE_OK, ResultVo.MSG_OK);
    }


}