优化代码

java110-bean/src/main/java/com/java110/dto/appraise/AppraiseDto.java

@@ -8,6 +8,11 @@ import java.util.Date;
  */
 public class AppraiseDto implements Serializable {
 
+    //评价单
+    public static final String OBJ_TYPE_REPAIR = "10001";
+
+    public static final String APPRAISE_TYPE_PUBLIC = "10000"; // 评价类型 普通类型
+
 
     private String appraiseId;
     private int appraiseScore;
@@ -19,6 +24,7 @@ public class AppraiseDto implements Serializable {
     private String appraiseUserName;
     private String objType;
     private String objId;
+    private String statusCd;
 
 
     public String getAppraiseId() {
@@ -100,4 +106,12 @@ public class AppraiseDto implements Serializable {
     public void setObjId(String objId) {
         this.objId = objId;
     }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

java110-bean/src/main/java/com/java110/dto/order/OrderDto.java

@@ -9,6 +9,7 @@ public class OrderDto extends PageDto implements Serializable {
     public static final String APP_ID = "APP-ID";
     public static final String TRANSACTION_ID = "TRANSACTION-ID";
     public static final String REQUEST_TIME = "REQUEST-TIME";
+    public static final String USER_ID = "USER-ID";
 
     public static final String O_ID = "O-ID";
 

java110-bean/src/main/java/com/java110/dto/order/OrderItemDto.java

@@ -1,5 +1,6 @@
 package com.java110.dto.order;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.PageDto;
 
 import java.io.Serializable;
@@ -88,4 +89,9 @@ public class OrderItemDto extends PageDto implements Serializable {
     public void setLogText(String logText) {
         this.logText = logText;
     }
+
+    @Override
+    public String toString() {
+        return JSONObject.toJSONString(this);
+    }
 }

java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java

@@ -4,13 +4,7 @@ import com.java110.core.factory.Java110TransactionalFactory;
 import com.java110.dto.order.OrderDto;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
@@ -69,6 +63,9 @@ public class Java110TransactionalAop {
             if (OrderDto.O_ID.equals(key.toUpperCase())) {
                 orderDto.setoId(value);
             }
+            if (OrderDto.USER_ID.equals(key.toUpperCase())) {
+                orderDto.setUserId(value);
+            }
         }
         orderDto.setOrderTypeCd(OrderDto.ORDER_TYPE_DEAL);
         //全局事务ID申请
@@ -86,8 +83,7 @@ public class Java110TransactionalAop {
     public void throwException(JoinPoint jp) {
         logger.debug("方法调用异常执行throwException（）");
 
-        //回退事务
-        Java110TransactionalFactory.fallbackOId();
+
     }
 
     //后置最终通知,final增强，不管是抛出异常或者正常退出都会执行
@@ -95,8 +91,6 @@ public class Java110TransactionalAop {
     public void after(JoinPoint jp) throws IOException {
         // 接收到请求，记录请求内容
         logger.debug("方法调用后执行after（）");
-
-
     }
 
     //环绕通知,环绕增强，相当于MethodInterceptor
@@ -104,9 +98,17 @@ public class Java110TransactionalAop {
     public Object around(ProceedingJoinPoint pjp) {
         try {
             Object o = pjp.proceed();
+            //观察者不做处理
+            if (Java110TransactionalFactory.ROLE_OBSERVER.equals(Java110TransactionalFactory.getServiceRole())) {
+                return o;
+            }
+            //完成事务
+            Java110TransactionalFactory.finishOId();
             return o;
         } catch (Throwable e) {
             logger.error("执行方法异常", e);
+            //回退事务
+            Java110TransactionalFactory.fallbackOId();
             return new ResponseEntity("内部异常" + e.getLocalizedMessage(), HttpStatus.BAD_REQUEST);
         }
     }

java110-core/src/main/java/com/java110/core/aop/Java110TransactionalInterceptor.java

@@ -0,0 +1,34 @@
+package com.java110.core.aop;
+
+import com.java110.core.factory.Java110TransactionalFactory;
+import com.java110.dto.order.OrderDto;
+import com.java110.utils.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 写上层事务ID
+ */
+@Component
+public class Java110TransactionalInterceptor implements HandlerInterceptor {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+
+        //说明已经开启事务
+        if (!StringUtils.isEmpty(Java110TransactionalFactory.getOId())) {
+            return true;
+        }
+        String oId = request.getHeader(OrderDto.O_ID);
+
+        if (!StringUtil.isEmpty(oId)) {
+            Java110TransactionalFactory.put(Java110TransactionalFactory.O_ID, oId);
+        }
+
+        return true;
+    }
+}

java110-core/src/main/java/com/java110/core/factory/Java110TransactionalFactory.java

@@ -8,11 +8,7 @@ import com.java110.utils.util.StringUtil;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestTemplate;
 
@@ -44,6 +40,11 @@ public class Java110TransactionalFactory {
      */
     private static final String FALLBACK_O_ID = URL_API + "/fallBackOId";
 
+    /**
+     * 回退事务ID
+     */
+    private static final String FINISH_O_ID = URL_API + "/finishOId";
+
 
     //全局事务ID
     public static final String O_ID = "O-ID";
@@ -51,6 +52,14 @@ public class Java110TransactionalFactory {
     //当前服务ID
     public static final String SERVICE_ID = "SERVICE-ID";
 
+    //服务角色 创建事务者 还是 观察者
+    public static final String SERVICE_ROLE = "SERVICE-ROLE";
+
+    //创建者
+    public static final String ROLE_CREATE = "creator";
+
+    public static final String ROLE_OBSERVER = "observer";
+
     private static ThreadLocal<Map<String, String>> threadLocal = new ThreadLocal<Map<String, String>>() {
         @Override
         protected Map<String, String> initialValue() {
@@ -78,9 +87,13 @@ public class Java110TransactionalFactory {
         //全局事务开启者
         if (StringUtils.isEmpty(orderDto.getoId())) {
             createOId(orderDto);
+            put(SERVICE_ROLE, ROLE_CREATE);
+        } else {
+            put(SERVICE_ROLE, ROLE_OBSERVER);//观察者
         }
-        String oId = get(O_ID);
-        return oId;
+        //将事务ID 存放起来
+        put(O_ID, orderDto.getoId());
+        return orderDto.getoId();
     }
 
     /**
@@ -93,6 +106,17 @@ public class Java110TransactionalFactory {
         return oId;
     }
 
+
+    /**
+     * 获取事务ID
+     *
+     * @return
+     */
+    public static String getServiceRole() {
+        String oId = get(SERVICE_ROLE);
+        return oId;
+    }
+
     /**
      * 创建事务
      *
@@ -130,7 +154,7 @@ public class Java110TransactionalFactory {
      */
     public static void fallbackOId() {
         String oId = getOId();
-        if (StringUtil.isEmpty(oId)) {
+        if (StringUtil.isEmpty(oId) || ROLE_OBSERVER.equals(getServiceRole())) {
             //当前没有开启事务无需回退
             logger.debug("当前没有开启事务无需回退");
             return;
@@ -162,4 +186,42 @@ public class Java110TransactionalFactory {
         }
 
     }
+
+    /**
+     * 处理失败，回退事务
+     */
+    public static void finishOId() {
+        String oId = getOId();
+        if (StringUtil.isEmpty(oId) || ROLE_OBSERVER.equals(getServiceRole())) {
+            //当前没有开启事务无需回退
+            logger.debug("当前没有开启事务无需回退");
+            return;
+        }
+        OrderDto orderDto = new OrderDto();
+        orderDto.setoId(oId);
+        RestTemplate restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
+        HttpHeaders header = new HttpHeaders();
+        HttpEntity<String> httpEntity = new HttpEntity<String>(JSONObject.toJSONString(orderDto), header);
+        ResponseEntity<String> responseEntity = null;
+        try {
+            responseEntity = restTemplate.exchange(FINISH_O_ID, HttpMethod.POST, httpEntity, String.class);
+        } catch (HttpStatusCodeException e) { //这里spring 框架 在4XX 或 5XX 时抛出 HttpServerErrorException 异常，需要重新封装一下
+            responseEntity = new ResponseEntity<String>(e.getResponseBodyAsString(), e.getStatusCode());
+        } catch (Exception e) {
+            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        } finally {
+            logger.debug("完成事务 请求地址为,{} 请求订单服务信息，{},订单服务返回信息，{}", FINISH_O_ID, httpEntity, responseEntity);
+        }
+
+        if (responseEntity.getStatusCode() == HttpStatus.NOT_FOUND) {
+            //当前没有开启事务无需回退
+            logger.debug("当前没有开启事务无需处理");
+            return;
+        }
+
+        if (responseEntity.getStatusCode() == HttpStatus.BAD_REQUEST) {
+            throw new IllegalArgumentException("完成事务失败" + responseEntity.getBody());
+        }
+
+    }
 }

java110-db/pom.xml

@@ -73,5 +73,21 @@
             <artifactId>java110-interface</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.java110</groupId>
+            <artifactId>java110-bean</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.java110</groupId>
+            <artifactId>java110-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 </project>

java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java

@@ -1,30 +1,45 @@
 package com.java110.db;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.client.RestTemplate;
+import com.java110.core.factory.Java110TransactionalFactory;
+import com.java110.db.dao.IQueryServiceDAO;
+import com.java110.dto.order.OrderItemDto;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.factory.ApplicationContextFactory;
+import com.java110.utils.util.StringUtil;
 import org.apache.ibatis.executor.Executor;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ParameterMapping;
+import org.apache.ibatis.mapping.SqlCommandType;
 import org.apache.ibatis.plugin.*;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.type.TypeHandlerRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.*;
 
 import java.text.DateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
+import java.util.*;
 
 @Intercepts({
         @Signature(type = Executor.class, method = "update", args = {MappedStatement.class,
                 Object.class})
 })
-
 public class Java110MybatisInterceptor implements Interceptor {
     private static Logger logger = LoggerFactory.getLogger(Java110MybatisInterceptor.class);
 
+    IQueryServiceDAO queryServiceDAOImpl;
+    RestTemplate restTemplate;
+
     @Override
     public Object intercept(Invocation invocation) throws Throwable {
+        if (StringUtil.isEmpty(Java110TransactionalFactory.getOId())) { //未开启事务
+            return invocation.proceed();
+        }
         MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
         SqlCommandType sqlCommandType = mappedStatement.getSqlCommandType();
         Object parameter = null;
@@ -36,16 +51,16 @@ public class Java110MybatisInterceptor implements Interceptor {
         Configuration configuration = mappedStatement.getConfiguration();
         //获取sql语句
         String sql = showSql(configuration, boundSql);
-
+        restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
         switch (sqlCommandType) {
             case INSERT:
-                dealInsertSql(mappedStatement, parameter,sql);
+                dealInsertSql(mappedStatement, parameter, sql);
                 break;
             case UPDATE:
-                dealUpdateSql(mappedStatement, parameter,sql);
+                dealUpdateSql(mappedStatement, parameter, sql);
                 break;
             case DELETE:
-                dealDeleteSql(mappedStatement, parameter,sql);
+                dealDeleteSql(mappedStatement, parameter, sql);
                 break;
         }
         return invocation.proceed();
@@ -57,7 +72,46 @@ public class Java110MybatisInterceptor implements Interceptor {
      * @param mappedStatement
      * @param parameter
      */
-    private void dealDeleteSql(MappedStatement mappedStatement, Object parameter,String sql) {
+    private void dealDeleteSql(MappedStatement mappedStatement, Object parameter, String sql) {
+
+        String tmpTable = sql.substring(sql.indexOf("into") + 4, sql.indexOf("("));
+        String tmpWhere = sql.substring(sql.indexOf("where"));
+        //插入操作时之前的 没有数据 所以 preValue 为空对象
+        JSONArray preValues = new JSONArray();
+
+        String execSql = "select * from " + tmpTable + " " + tmpWhere;
+
+        queryServiceDAOImpl = ApplicationContextFactory.getBean("queryServiceDAOImpl", IQueryServiceDAO.class);
+        List<Map<String, Object>> deleteDatas = queryServiceDAOImpl.executeSql(execSql, null);
+
+        if (deleteDatas != null && deleteDatas.size() > 0) {
+            for (Map<String, Object> map : deleteDatas) {
+                preValues.add(map);
+            }
+        }
+
+        JSONArray afterValues = new JSONArray();
+
+        JSONObject logText = new JSONObject();
+        logText.put("preValue", preValues);
+        logText.put("afterValue", afterValues);
+
+        OrderItemDto orderItemDto = new OrderItemDto();
+        orderItemDto.setbId("-1");
+        orderItemDto.setAction("DEL");
+        orderItemDto.setActionObj(tmpTable.trim());
+        orderItemDto.setLogText(logText.toJSONString());
+        orderItemDto.setServiceName(ApplicationContextFactory.getApplicationName());
+        orderItemDto.setoId(Java110TransactionalFactory.getOId());
+
+        String url = ServiceConstant.SERVICE_ORDER_URL + "/order/oIdApi/createOrderItem";
+        HttpHeaders httpHeaders = new HttpHeaders();
+        HttpEntity httpEntity = new HttpEntity(orderItemDto.toString(), httpHeaders);
+        ResponseEntity<String> responseEntity = restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new IllegalArgumentException("注册事务回滚日志失败" + responseEntity);
+        }
     }
 
     /**
@@ -66,7 +120,71 @@ public class Java110MybatisInterceptor implements Interceptor {
      * @param mappedStatement
      * @param parameter
      */
-    private void dealUpdateSql(MappedStatement mappedStatement, Object parameter,String sql) {
+    private void dealUpdateSql(MappedStatement mappedStatement, Object parameter, String sql) {
+        //RestTemplate restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
+
+        String tmpTable = sql.substring(sql.indexOf("update") + 6, sql.indexOf("set"));
+        String tmpWhere = sql.substring(sql.indexOf("where"));
+        String tmpKey = sql.substring(sql.indexOf("set") + 3, sql.indexOf("where"));
+        String[] tmpString = tmpKey.split(",");
+        Map tmpAfterMap = new HashMap();
+        for (String tmp : tmpString) {
+            String[] keyValues = tmp.split("=");
+            String key = "";
+            if (keyValues.length != 2) {
+                throw new IllegalArgumentException("update 语句可能有问题，没有 set 中出错 " + sql);
+            }
+            if (keyValues[0].contains(".")) {
+                key = keyValues[0].substring(keyValues[0].indexOf(".") + 1);
+            } else {
+                key = keyValues[0];
+            }
+            tmpAfterMap.put(key.trim(), keyValues[1].trim());
+        }
+
+
+        if (tmpString == null || tmpString.length < 1) {
+            throw new IllegalArgumentException("update 语句可能有问题，没有 set 内容 " + sql);
+        }
+        //插入操作时之前的 没有数据 所以 preValue 为空对象
+        JSONArray preValues = new JSONArray();
+        JSONArray afterValues = new JSONArray();
+        JSONObject afterVaule = null;
+        String execSql = "select * from " + tmpTable + " " + tmpWhere;
+
+        queryServiceDAOImpl = ApplicationContextFactory.getBean("queryServiceDAOImpl", IQueryServiceDAO.class);
+        List<Map<String, Object>> deleteDatas = queryServiceDAOImpl.executeSql(execSql, null);
+
+        if (deleteDatas != null && deleteDatas.size() > 0) {
+            for (Map<String, Object> map : deleteDatas) {
+                preValues.add(map);
+                afterVaule = new JSONObject();
+                afterVaule.putAll(map);
+                afterVaule.putAll(tmpAfterMap);
+                afterValues.add(afterVaule);
+            }
+        }
+
+        JSONObject logText = new JSONObject();
+        logText.put("preValue", preValues);
+        logText.put("afterValue", afterValues);
+
+        OrderItemDto orderItemDto = new OrderItemDto();
+        orderItemDto.setbId("-1");
+        orderItemDto.setAction("MOD");
+        orderItemDto.setActionObj(tmpTable.trim());
+        orderItemDto.setLogText(logText.toJSONString());
+        orderItemDto.setServiceName(ApplicationContextFactory.getApplicationName());
+        orderItemDto.setoId(Java110TransactionalFactory.getOId());
+
+        String url = ServiceConstant.SERVICE_ORDER_URL + "/order/oIdApi/createOrderItem";
+        HttpHeaders httpHeaders = new HttpHeaders();
+        HttpEntity httpEntity = new HttpEntity(orderItemDto.toString(), httpHeaders);
+        ResponseEntity<String> responseEntity = restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new IllegalArgumentException("注册事务回滚日志失败" + responseEntity);
+        }
     }
 
     /**
@@ -75,10 +193,53 @@ public class Java110MybatisInterceptor implements Interceptor {
      * @param mappedStatement
      * @param parameter
      */
-    private void dealInsertSql(MappedStatement mappedStatement, Object parameter,String sql) {
-        String deleteSql = "delete from ";
+    private void dealInsertSql(MappedStatement mappedStatement, Object parameter, String sql) {
 
+        // RestTemplate restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
 
+        //插入操作时之前的 没有数据 所以 preValue 为空对象
+        JSONArray preValues = new JSONArray();
+
+        JSONArray afterValues = new JSONArray();
+        JSONObject afterValue = new JSONObject();
+        String tmpTable = sql.substring(sql.toLowerCase().indexOf("into") + 4, sql.indexOf("("));
+        String tmpKey = sql.substring(sql.indexOf("(") + 1, sql.indexOf(")"));
+        String tmpValue = sql.substring(sql.lastIndexOf("(") + 1, sql.lastIndexOf(")"));
+        String[] tmpKeys = tmpKey.split(",");
+        String[] tmpValues = tmpValue.split(",");
+
+        if (tmpKeys.length != tmpValues.length) {
+            throw new IllegalArgumentException("sql 错误 key 和value 个数不等" + sql);
+        }
+
+        if (tmpKeys.length < 1) {
+            throw new IllegalArgumentException("sql 错误 未找到key" + sql);
+        }
+        for (int keyIndex = 0; keyIndex < tmpKeys.length; keyIndex++) {
+            afterValue.put(tmpKeys[keyIndex], tmpValues[keyIndex]);
+        }
+        afterValues.add(afterValue);
+
+        JSONObject logText = new JSONObject();
+        logText.put("preValue", preValues);
+        logText.put("afterValue", afterValues);
+
+        OrderItemDto orderItemDto = new OrderItemDto();
+        orderItemDto.setbId("-1");
+        orderItemDto.setAction("ADD");
+        orderItemDto.setActionObj(tmpTable.trim());
+        orderItemDto.setLogText(logText.toJSONString());
+        orderItemDto.setServiceName(ApplicationContextFactory.getApplicationName());
+        orderItemDto.setoId(Java110TransactionalFactory.getOId());
+
+        String url = ServiceConstant.SERVICE_ORDER_URL + "/order/oIdApi/createOrderItem";
+        HttpHeaders httpHeaders = new HttpHeaders();
+        HttpEntity httpEntity = new HttpEntity(orderItemDto.toString(), httpHeaders);
+        ResponseEntity<String> responseEntity = restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new IllegalArgumentException("注册事务回滚日志失败" + responseEntity);
+        }
 
     }
 
@@ -117,7 +278,7 @@ public class Java110MybatisInterceptor implements Interceptor {
                 }
             }
         }
-        return sql;
+        return sql.toLowerCase();
     }
 
     private String getParameterValue(Object obj) {

java110-service/src/main/java/com/java110/service/dao/IQueryServiceDAO.java

@@ -1,9 +1,8 @@
-package com.java110.service.dao;
+package com.java110.db.dao;
 
 import com.java110.entity.order.ServiceBusiness;
 import com.java110.entity.service.ServiceSql;
 
-import javax.validation.OverridesAttribute;
 import java.util.List;
 import java.util.Map;
 

java110-service/src/main/java/com/java110/service/dao/impl/QueryServiceDAOImpl.java

@@ -1,10 +1,10 @@
-package com.java110.service.dao.impl;
+package com.java110.db.dao.impl;
 
 import com.java110.utils.util.StringUtil;
 import com.java110.core.base.dao.BaseServiceDao;
 import com.java110.entity.order.ServiceBusiness;
 import com.java110.entity.service.ServiceSql;
-import com.java110.service.dao.IQueryServiceDAO;
+import com.java110.db.dao.IQueryServiceDAO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

java110-db/src/main/resources/mapper/center/CenterServiceDAOImplMapper.xml

@@ -11,7 +11,7 @@
         requestTime,
         `create_time` createTime,`order_type_cd` orderTypeCd, `finish_time` finishTime, `remark`
         from c_orders t
-        where t.status_cd = '0'
+        where 1=1
         <if test="oId != null and oId != ''">
             and t.o_id = #{oId}
         </if>
@@ -29,7 +29,7 @@
         t.finish_time finishTime,t.remark,ul.service_name serviceName,ul.log_text logText
         from c_order_item t
         LEFT JOIN unitem_log ul on t.b_id = ul.b_id and t.o_id = ul.o_id and ul.status_cd = '0'
-        where t.status_cd = '0'
+        where 1=1
         <if test="oId != null and oId != ''">
             and t.o_id = #{oId}
         </if>
@@ -44,7 +44,7 @@
         <![CDATA[
 
                     insert into c_orders(o_id,app_id,ext_transaction_id,user_id,request_time,order_type_cd,remark,status_cd)
-                    values(#{oId},#{appId},#{extTransactionId},#{userId},#{requestTime},#{orderTypeCd},#{remark},#{statusCd})
+                    values(#{oId},#{appId},#{extTransactionId},#{userId},#{requestTime},#{orderTypeCd},#{remark},'S')
 
         ]]>
     </insert>
@@ -58,15 +58,29 @@
 
     <!--保存订单信息 c_order_item 中 -->
     <insert id="saveOrderItem" parameterType="Map">
-        INSERT INTO `c_order_item` (`b_id`, `o_id`, `action`, `action_obj`, `finish_time`, `remark`)
-        VALUES (#{bId}, #{oId}, #{action}, #{actionObj}, #{finishTime}, #{remark})
+        INSERT INTO `c_order_item` (`b_id`, `o_id`, `action`, `action_obj`, `finish_time`, `remark`,status_cd)
+        VALUES (#{bId}, #{oId}, #{action}, #{actionObj}, #{finishTime}, #{remark},'S')
     </insert>
 
     <!--保存订单信息 unitem_log 中 -->
     <insert id="saveUnItemLog" parameterType="Map">
-        INSERT INTO `unitem_log` (`b_id`, `o_id`, `service_name`, `log_text`)
-        VALUES (#{bId}, #{oId}, #{serviceName}, #{logText})
+        INSERT INTO `unitem_log` (`b_id`, `o_id`, `service_name`, `log_text`,status_cd)
+        VALUES (#{bId}, #{oId}, #{serviceName}, #{logText},'0')
     </insert>
+    <!-- 修改订单项信息 -->
+    <update id="updateOrderItem" parameterType="Map">
+        update c_order_item t
+        set t.finish_time = #{finishTime},
+             t.status_cd = #{statusCd}
+        where t.o_id = #{oId}
+    </update>
+
+    <!-- 删除事务日志 -->
+    <update id="deleteUnItemLog" parameterType="Map">
+        delete from unitem_log where o_id = #{oId}
+    </update>
+
+
 
     <!-- 保存订单项信息 c_business -->
     <insert id="saveBusiness" parameterType="Map">

java110-db/src/main/resources/mapper/common/AppraiseServiceDaoImplMapper.xml

@@ -7,10 +7,10 @@
     <!-- 保存评价信息 add by wuxw 2018-07-03 -->
     <insert id="saveAppraise" parameterType="Map">
         INSERT INTO appraise (`appraise_id`, `appraise_score`, `appraise_type`, `context`, `parent_appraise_id`,
-        `appraise_user_id`, `appraise_user_name`, `obj_type`, `obj_id`)
+        `appraise_user_id`, `appraise_user_name`, `obj_type`, `obj_id`,status_cd)
         VALUES (#{appraiseId}, #{appraiseScore}, #{appraiseType}, #{context}, #{parentAppraiseId}, #{appraiseUserId},
         #{appraiseUserName},
-        #{objType}, #{objId});
+        #{objType}, #{objId},'0');
     </insert>
 
 </mapper>

java110-interface/src/main/java/com/java110/intf/community/repair/IAppraiseRepairService.java

@@ -0,0 +1,24 @@
+package com.java110.intf.community.repair;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.appraise.AppraiseDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * 保存评价接口类
+ */
+@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/repair")
+public interface IAppraiseRepairService {
+
+    /**
+     * 保存接口评价
+     * @param appraiseDto
+     * @return
+     */
+    @RequestMapping(value = "/appraiseRepair", method = RequestMethod.POST)
+    public AppraiseDto appraiseRepair(@RequestBody AppraiseDto appraiseDto);
+}

java110-service/src/main/java/com/java110/service/api/BusinessApi.java

@@ -1,13 +1,13 @@
 package com.java110.service.api;
 
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.util.Assert;
-import com.java110.service.context.DataQueryFactory;
-import com.java110.core.factory.DataTransactionFactory;
 import com.java110.core.base.controller.BaseController;
+import com.java110.core.factory.DataTransactionFactory;
 import com.java110.service.context.DataQuery;
+import com.java110.service.context.DataQueryFactory;
 import com.java110.service.smo.IQueryServiceSMO;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.util.Assert;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -166,6 +166,17 @@ public class BusinessApi extends BaseController {
         }
     }
 
+
+    @RequestMapping(path = "/businessApi/fallBack", method = RequestMethod.POST)
+    public ResponseEntity<String> fallBack(@RequestBody String fallBackInfo) {
+        try {
+            return queryServiceSMOImpl.fallBack(fallBackInfo);
+        } catch (Exception e) {
+            logger.error("请求订单异常", e);
+            return new ResponseEntity<String>("处理异常", HttpStatus.BAD_REQUEST);
+        }
+    }
+
     public IQueryServiceSMO getQueryServiceSMOImpl() {
         return queryServiceSMOImpl;
     }

java110-service/src/main/java/com/java110/service/context/DataQuery.java

@@ -3,7 +3,7 @@ package com.java110.service.context;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.entity.service.ServiceSql;
-import com.java110.service.dao.IQueryServiceDAO;
+import com.java110.db.dao.IQueryServiceDAO;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;

java110-service/src/main/java/com/java110/service/smo/IQueryServiceSMO.java

@@ -2,6 +2,7 @@ package com.java110.service.smo;
 
 import com.java110.utils.exception.BusinessException;
 import com.java110.service.context.DataQuery;
+import org.springframework.http.ResponseEntity;
 
 /**
  * 公用查询处理
@@ -25,4 +26,13 @@ public interface IQueryServiceSMO {
      * @throws BusinessException
      */
     public void commonDoService(DataQuery dataQuery) throws BusinessException;
+
+
+    /**
+     * c_common_sql
+     * 公共受理服务
+     * @return
+     * @throws BusinessException
+     */
+    public ResponseEntity<String> fallBack(String fallBackInfo) throws BusinessException;
 }

java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java

@@ -4,18 +4,18 @@ import bsh.Interpreter;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONPath;
+import com.java110.core.factory.DataTransactionFactory;
+import com.java110.db.dao.IQueryServiceDAO;
+import com.java110.entity.service.ServiceSql;
+import com.java110.service.context.DataQuery;
+import com.java110.service.smo.IQueryServiceSMO;
 import com.java110.utils.cache.ServiceSqlCache;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.BusinessException;
-import com.java110.core.factory.DataTransactionFactory;
 import com.java110.utils.log.LoggerEngine;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.StringUtil;
-import com.java110.service.context.DataQuery;
-import com.java110.entity.service.ServiceSql;
-import com.java110.service.dao.IQueryServiceDAO;
-import com.java110.service.smo.IQueryServiceSMO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.ognl.Ognl;
 import org.apache.ibatis.ognl.OgnlException;
@@ -119,6 +119,23 @@ public class QueryServiceSMOImpl extends LoggerEngine implements IQueryServiceSM
 
     }
 
+    @Override
+    public ResponseEntity<String> fallBack(String fallBackInfo) throws BusinessException {
+
+        JSONArray params = JSONArray.parseArray(fallBackInfo);
+        for (int paramIndex = 0; paramIndex < params.size(); paramIndex++) {
+            JSONObject param = params.getJSONObject(paramIndex);
+            String sql = param.getString("fallBackSql");
+            if (StringUtil.isEmpty(sql)) {
+                return new ResponseEntity<String>("未包含sql信息", HttpStatus.BAD_REQUEST);
+            }
+            int flag = queryServiceDAOImpl.updateSql(sql, null);
+
+        }
+        return new ResponseEntity<String>("回退成功", HttpStatus.OK);
+
+    }
+
     /**
      * {"PARAM:"{
      * "param1": "$.a.#A#Object",
@@ -344,7 +361,7 @@ public class QueryServiceSMOImpl extends LoggerEngine implements IQueryServiceSM
         String[] oSqls = oldSql.split("</if>");
         for (String oSql : oSqls) {
             logger.debug("处理if 节点，当前处理的oSql=" + oSql + "总的oSqls = " + oSqls);
-            if(StringUtil.isNullOrNone(oSql) || !oSql.contains("<if")){
+            if (StringUtil.isNullOrNone(oSql) || !oSql.contains("<if")) {
                 newSql.append(oSql);
                 continue;
             }

java110-utils/pom.xml

@@ -153,5 +153,6 @@
             <groupId>com.belerweb</groupId>
             <artifactId>pinyin4j</artifactId>
         </dependency>
+
     </dependencies>
 </project>

java110-utils/src/main/java/com/java110/utils/exception/InterceptorException.java

@@ -0,0 +1,189 @@
+package com.java110.utils.exception;
+
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+/**
+ * 拦截器异常
+ * Created by wuxw on 2018/4/14.
+ */
+public class InterceptorException extends RuntimeException {
+
+
+    private Result result;
+    private Throwable cause = this;
+
+    public InterceptorException(){}
+
+    /**
+     * 构造方法
+     * @param result 返回值
+     * @param cause  异常堆栈
+     */
+    public InterceptorException(Result result, Throwable cause) {
+        super(result.getMsg(), cause);
+        this.result = result;
+    }
+
+    /**
+     * 构造方法
+     * @param code 返回码
+     * @param msg  错误消息
+     */
+    public InterceptorException(int code, String msg) {
+        super(msg);
+        this.result = new Result(code, msg);
+    }
+
+    public InterceptorException(String code, String msg) {
+        super(msg);
+        this.result = new Result(code, msg);
+    }
+
+    /**
+     * 构造方法
+     * @param result 返回值
+     * @param detail 具体的返回消息
+     */
+    public InterceptorException(Result result, String detail) {
+        super(result.getMsg() + "," + detail);
+        this.result = new Result(result.getCode(), result.getMsg() + "," + detail);
+    }
+
+    /**
+     * 构造方法
+     * @param result 返回值
+     * @param detail 具体的返回消息
+     * @param cause  异常堆栈
+     */
+    public InterceptorException(Result result, String detail, Throwable cause) {
+        super(result.getMsg() + "," + detail, cause);
+        this.result = new Result(result.getCode(), result.getMsg() + "," + detail);
+    }
+
+    /**
+     * 构造方法
+     * @param code	返回码
+     * @param msg	返回消息
+     * @param cause 异常堆栈
+     */
+    public InterceptorException(int code, String msg, Throwable cause) {
+        super(msg, cause);
+
+        if(cause != null) {
+            if(cause.getCause() != null) {
+                msg += " cause:" + ExceptionUtils.populateExecption(cause.getCause(), 500);
+            }
+            msg += " StackTrace:"+ExceptionUtils.populateExecption(cause, 500);
+        }
+        this.result = new Result(code, msg);
+    }
+
+    /**
+     * 构造方法
+     * @param code	返回码
+     * @param cause	异常堆栈
+     */
+    public InterceptorException(int code, Throwable cause) {
+        super(cause);
+        String msg = "";
+
+        if(cause != null) {
+            if(cause.getCause() != null) {
+                msg += " cause:" + ExceptionUtils.populateExecption(cause.getCause(), 500);
+            }
+            msg += " StackTrace:"+ExceptionUtils.populateExecption(cause, 500);
+        }
+        this.result = new Result(code, msg);
+    }
+
+    /**
+     *
+     * TODO 简单描述该方法的实现功能（可选）.
+     * @see Throwable#getCause()
+     */
+    public synchronized Throwable getCause() {
+        return (cause==this ? super.getCause() : cause);
+    }
+
+
+    /**
+     * 返回异常消息
+     * @return 异常消息
+     */
+    @Override
+    public String getMessage() {
+        return ExceptionUtils.buildMessage(super.getMessage(), getCause());
+    }
+
+    /**
+     * 异常
+     * @return
+     */
+    public String toJsonString() {
+        JSONObject exceptionJson = JSONObject.parseObject("{\"exception\":{}");
+        JSONObject exceptionJsonObj = exceptionJson.getJSONObject("exception");
+
+        if (getResult() != null)
+            exceptionJsonObj.putAll(JSONObject.parseObject(result.toString()));
+
+        exceptionJsonObj.put("exceptionTrace",getMessage());
+
+        return exceptionJsonObj.toString();
+    }
+    @Override
+    public void printStackTrace(PrintStream ps) {
+        ps.print("<exception>");
+        if (getResult() != null) {
+            ps.print(result.toString());
+        }
+        ps.append("<exceptionTrace>");
+
+        Throwable cause = getCause();
+        if (cause == null) {
+            super.printStackTrace(ps);
+        } else {
+            ps.println(this);
+            ps.print("Caused by: ");
+            cause.printStackTrace(ps);
+        }
+        ps.append("</exceptionTrace>");
+        ps.println("</exception>");
+    }
+
+    @Override
+    public void printStackTrace(PrintWriter pw) {
+        pw.print("<exception>");
+        if (getResult() != null) {
+            pw.print(result.toString());
+        }
+        pw.append("<exceptionTrace>");
+
+        Throwable cause = getCause();
+        if (cause == null) {
+            super.printStackTrace(pw);
+        } else {
+            pw.println(this);
+            pw.print("Caused by: ");
+            cause.printStackTrace(pw);
+        }
+        pw.append("</exceptionTrace>");
+        pw.println("</exception>");
+    }
+
+    /**
+     * 返回异常值
+     * @return	异常值对象
+     */
+    public Result getResult() {
+        return result;
+    }
+
+    public void setResult(Result result) {
+        this.result = result;
+    }
+
+}

service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java

@@ -1,6 +1,7 @@
 package com.java110.common;
 
 import com.java110.core.annotation.Java110ListenerDiscovery;
+import com.java110.core.client.RestTemplate;
 import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
 import com.java110.service.init.ServiceStartInit;
 import org.slf4j.Logger;
@@ -15,7 +16,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
+
 
 import java.nio.charset.Charset;
 
@@ -60,7 +61,7 @@ public class CommonServiceApplicationStart {
     @LoadBalanced
     public RestTemplate restTemplate() {
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
+        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
         return restTemplate;
     }
 
@@ -70,9 +71,9 @@ public class CommonServiceApplicationStart {
      * @return restTemplate
      */
     @Bean
-    public com.java110.core.client.RestTemplate outRestTemplate() {
+    public RestTemplate outRestTemplate() {
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        com.java110.core.client.RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(com.java110.core.client.RestTemplate.class);
+        com.java110.core.client.RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
         return restTemplate;
     }
 

service-common/src/main/java/com/java110/common/service/appraise/SaveAppraiseServiceImpl.java

@@ -7,6 +7,7 @@ import com.java110.dto.appraise.AppraiseDto;
 import com.java110.intf.common.appraise.ISaveAppraiseService;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -42,6 +43,10 @@ public class SaveAppraiseServiceImpl implements ISaveAppraiseService {
         if (appraiseDto.getAppraiseId().startsWith("-")) {
             appraiseDto.setAppraiseId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appraiseId));
         }
+
+        if (StringUtil.isEmpty(appraiseDto.getParentAppraiseId())) {
+            appraiseDto.setParentAppraiseId("-1");
+        }
         int saveFlag = appraiseServiceDaoImpl.saveAppraise(BeanConvertUtil.beanCovertMap(appraiseDto));
         if (saveFlag > 0) {
             return appraiseDto;

service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java

@@ -1,6 +1,7 @@
 package com.java110.community;
 
 import com.java110.core.annotation.Java110ListenerDiscovery;
+import com.java110.core.client.RestTemplate;
 import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
 import com.java110.service.init.ServiceStartInit;
 import org.slf4j.Logger;
@@ -14,7 +15,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
 
 import java.nio.charset.Charset;
 
@@ -29,11 +29,11 @@ import java.nio.charset.Charset;
  * @tag
  */
 @SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.community",
-        "com.java110.core", "com.java110.config.properties.code","com.java110.db"})
+        "com.java110.core", "com.java110.config.properties.code", "com.java110.db"})
 @EnableDiscoveryClient
 @Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
         basePackages = {"com.java110.community.listener"})
-@EnableFeignClients(basePackages = {"com.java110.core.smo.user"})
+@EnableFeignClients(basePackages = {"com.java110.core.smo.user", "com.java110.intf.common"})
 public class CommunityServiceApplicationStart {
 
     private static Logger logger = LoggerFactory.getLogger(CommunityServiceApplicationStart.class);
@@ -48,7 +48,7 @@ public class CommunityServiceApplicationStart {
     @LoadBalanced
     public RestTemplate restTemplate() {
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
+        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
         return restTemplate;
     }
 
@@ -65,11 +65,11 @@ public class CommunityServiceApplicationStart {
     }
 
     public static void main(String[] args) throws Exception {
-        try{
+        try {
             ApplicationContext context = SpringApplication.run(CommunityServiceApplicationStart.class, args);
             ServiceStartInit.initSystemConfig(context);
-        }catch (Throwable e){
-            logger.error("系统启动失败",e);
+        } catch (Throwable e) {
+            logger.error("系统启动失败", e);
         }
     }
 }

service-community/src/main/java/com/java110/community/service/repair/AppraiseRepairServiceImpl.java

@@ -0,0 +1,46 @@
+package com.java110.community.service.repair;
+
+import com.java110.community.dao.IRepairServiceDao;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.dto.appraise.AppraiseDto;
+import com.java110.dto.repair.RepairDto;
+import com.java110.intf.common.appraise.ISaveAppraiseService;
+import com.java110.intf.community.repair.IAppraiseRepairService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * 报修评价
+ */
+@RestController
+public class AppraiseRepairServiceImpl implements IAppraiseRepairService {
+
+    @Autowired
+    private ISaveAppraiseService saveAppraiseServiceImpl;
+    @Autowired
+    private IRepairServiceDao repairServiceDaoImpl;
+
+    @Override
+    @Java110Transactional
+    public AppraiseDto appraiseRepair(@RequestBody AppraiseDto appraiseDto) {
+
+        //将工单表的状态修改为完成
+        Map info = new HashMap();
+        info.put("repairId", appraiseDto.getObjId());
+        info.put("statusCd", "0");
+        info.put("state", RepairDto.STATE_RETURN_VISIT);
+        repairServiceDaoImpl.updateRepairInfoInstance(info);
+
+        //评价表中加入评价内容
+        appraiseDto.setParentAppraiseId("-1");
+        appraiseDto.setObjType(AppraiseDto.OBJ_TYPE_REPAIR);
+        appraiseDto.setAppraiseType(AppraiseDto.APPRAISE_TYPE_PUBLIC);
+        return saveAppraiseServiceImpl.saveAppraise(appraiseDto);
+
+    }
+}

service-order/src/main/java/com/java110/order/api/OIdApi.java

@@ -63,4 +63,16 @@ public class OIdApi {
         OrderItemDto orderItemDto = BeanConvertUtil.covertBean(orderItemObj, OrderItemDto.class);
         return tServiceSMOImpl.createOrderItem(orderItemDto);
     }
+
+    /**
+     * 完成事务
+     *
+     * @return
+     */
+    @RequestMapping(path = "/finishOId", method = RequestMethod.POST)
+    public ResponseEntity<String> finishOId(@RequestBody String order) {
+        JSONObject orderObj = JSONObject.parseObject(order);
+        OrderDto orderDto = BeanConvertUtil.covertBean(orderObj, OrderDto.class);
+        return tServiceSMOImpl.finishOrder(orderDto);
+    }
 }

service-order/src/main/java/com/java110/order/dao/ICenterServiceDAO.java

@@ -36,6 +36,23 @@ public interface ICenterServiceDAO {
      */
     public void saveOrderItem(Map orderItem) throws DAOException;
 
+    /**
+     * 完成订单信息
+     *
+     * @param orderItem 订单信息
+     * @return
+     */
+    public void updateOrderItem(Map orderItem) throws DAOException;
+
+    /**
+     * 完成订单信息
+     *
+     * @param orderItem 订单信息
+     * @return
+     */
+    public void deleteUnItemLog(Map orderItem) throws DAOException;
+
+
     /**
      * 保存订单信息
      *

service-order/src/main/java/com/java110/order/dao/impl/CenterServiceDAOImpl.java

@@ -64,6 +64,23 @@ public class CenterServiceDAOImpl extends BaseServiceDao implements ICenterServi
 
     }
 
+    @Override
+    public void updateOrderItem(Map orderItem) throws DAOException {
+        int saveFlag = sqlSessionTemplate.update("centerServiceDAOImpl.updateOrderItem", orderItem);
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "修改订单项失败：" + JSONObject.toJSONString(orderItem));
+        }
+    }
+
+    @Override
+    public void deleteUnItemLog(Map unItemLog) throws DAOException {
+        int saveFlag = sqlSessionTemplate.delete("centerServiceDAOImpl.deleteUnItemLog", unItemLog);
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "删除事务日志失败：" + JSONObject.toJSONString(unItemLog));
+        }
+    }
+
+
     /**
      * 保存订单信息
      *

service-order/src/main/java/com/java110/order/smo/IOIdServiceSMO.java

@@ -34,4 +34,12 @@ public interface IOIdServiceSMO {
      * @return
      */
     ResponseEntity<String> createOrderItem(OrderItemDto orderItemDto);
+
+
+    /**
+     * 完成事务
+     *
+     * @return
+     */
+    ResponseEntity<String> finishOrder(OrderDto orderDto);
 }

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

@@ -17,7 +17,7 @@ import com.java110.entity.center.AppRoute;
 import com.java110.entity.mapping.Mapping;
 import com.java110.service.context.DataQuery;
 import com.java110.entity.service.ServiceSql;
-import com.java110.service.dao.IQueryServiceDAO;
+import com.java110.db.dao.IQueryServiceDAO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -9,6 +9,7 @@ import com.java110.dto.order.OrderItemDto;
 import com.java110.order.dao.ICenterServiceDAO;
 import com.java110.order.smo.IOIdServiceSMO;
 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;
@@ -33,7 +34,7 @@ public class OIdServiceSMOImpl implements IOIdServiceSMO {
     private static Logger logger = LoggerFactory.getLogger(OIdServiceSMOImpl.class);
 
 
-    public static final String FALLBACK_URL = "http://SERVICE_NAME/fallBack";
+    public static final String FALLBACK_URL = "http://SERVICE_NAME/businessApi/fallBack";
 
     public static final String SERVICE_NAME = "SERVICE_NAME";
 
@@ -61,6 +62,10 @@ public class OIdServiceSMOImpl implements IOIdServiceSMO {
             throw new IllegalArgumentException("未包含请求时间");
         }
 
+        if (StringUtil.isEmpty(orderDto.getUserId())) {
+            throw new IllegalArgumentException("未包含用户ID");
+        }
+
         //保存订单信息
         centerServiceDAOImpl.saveOrder(BeanConvertUtil.beanCovertMap(orderDto));
         return new ResponseEntity<String>(JSONObject.toJSONString(orderDto), HttpStatus.OK);
@@ -93,13 +98,32 @@ public class OIdServiceSMOImpl implements IOIdServiceSMO {
         List<OrderItemDto> errorOrderItemDtos = new ArrayList<>();
         for (OrderItemDto orderItemDto : orderItemDtos) {
             try {
-                httpEntity = new HttpEntity<String>(JSONObject.toJSONString(orderItemDto), header);
+                JSONArray params = generateParam(orderItemDto);
+                httpEntity = new HttpEntity<String>(params.toJSONString(), header);
                 restTemplate.exchange(FALLBACK_URL.replace(SERVICE_NAME, orderItemDto.getServiceName()), HttpMethod.POST, httpEntity, String.class);
             } catch (Exception e) {
                 logger.error("回退事务失败", e);
                 errorOrderItemDtos.add(orderItemDto);
             }
         }
+
+        //标记为订单项失败
+        Map info = new HashMap();
+        info.put("finishTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        info.put("statusCd", "E");
+        info.put("oId", orderDto.getoId());
+        centerServiceDAOImpl.updateOrderItem(info);
+
+        //删除 事务日志
+        centerServiceDAOImpl.deleteUnItemLog(info);
+
+        //标记为订单失败
+        info = new HashMap();
+        info.put("finishTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        info.put("statusCd", "E");
+        info.put("oId", orderDto.getoId());
+        centerServiceDAOImpl.updateOrder(info);
+
         if (errorOrderItemDtos.size() > 0) {
             return new ResponseEntity<String>(JSONArray.toJSONString(errorOrderItemDtos), HttpStatus.BAD_REQUEST);
         } else {
@@ -107,6 +131,127 @@ public class OIdServiceSMOImpl implements IOIdServiceSMO {
         }
     }
 
+    /**
+     * 生成回滚sql
+     *
+     * @param orderItemDto
+     * @return
+     */
+    private JSONArray generateParam(OrderItemDto orderItemDto) {
+        JSONArray params = null;
+        switch (orderItemDto.getAction()) {
+            case "ADD":
+                params = generateDeleteSql(orderItemDto);
+                break;
+            case "MOD":
+                params = generateUpdateSql(orderItemDto);
+                break;
+            case "DEL":
+                params = generateInsertSql(orderItemDto);
+                break;
+        }
+
+        return params;
+    }
+
+    /**
+     * 生成insert语句
+     *
+     * @param orderItemDto
+     * @return
+     */
+    private JSONArray generateInsertSql(OrderItemDto orderItemDto) {
+        JSONArray params = new JSONArray();
+        JSONObject param = null;
+        String sql = "";
+        String logText = orderItemDto.getLogText();
+
+        JSONObject logTextObj = JSONObject.parseObject(logText);
+        JSONArray preValues = logTextObj.getJSONArray("preValue");
+        for (int preValueIndex = 0; preValueIndex < preValues.size(); preValueIndex++) {
+            sql = "insert into " + orderItemDto.getActionObj() + " ";
+            param = new JSONObject();
+            JSONObject keyValue = preValues.getJSONObject(preValueIndex);
+            String keySql = "( ";
+            String valueSql = " values (";
+            for (String key : keyValue.keySet()) {
+                keySql += (key + ",");
+                valueSql += (keyValue.getString(key) + ",");
+            }
+            if (keySql.endsWith(",")) {
+                keySql = keySql.substring(0, keySql.length() - 1);
+            }
+            if (valueSql.endsWith(",")) {
+                valueSql = valueSql.substring(0, valueSql.length() - 1);
+            }
+            sql = sql + keySql + ") " + valueSql + ") ";
+            param.put("fallBackSql", sql);
+            params.add(param);
+        }
+
+        return params;
+    }
+
+    private JSONArray generateUpdateSql(OrderItemDto orderItemDto) {
+        JSONArray params = new JSONArray();
+        JSONObject param = null;
+        String sql = "";
+        String logText = orderItemDto.getLogText();
+
+        JSONObject logTextObj = JSONObject.parseObject(logText);
+        JSONArray preValues = logTextObj.getJSONArray("preValue");
+        JSONArray afterValues = logTextObj.getJSONArray("afterValue");
+
+        for (int preValueIndex = 0; preValueIndex < preValues.size(); preValueIndex++) {
+            sql = "update " + orderItemDto.getActionObj() + " set ";
+            param = new JSONObject();
+            JSONObject keyValue = preValues.getJSONObject(preValueIndex);
+            JSONObject afterKeyValue = afterValues.getJSONObject(preValueIndex);
+            String whereSql = " where 1=1 ";
+            for (String key : keyValue.keySet()) {
+                sql += (key + "=" + keyValue.getString(key) + ",");
+                whereSql += (" and " + key + " = " + afterKeyValue.getString(key));
+            }
+            if (sql.endsWith(",")) {
+                sql = sql.substring(0, sql.length() - 1);
+            }
+
+            sql += whereSql;
+
+            param.put("fallBackSql", sql);
+            params.add(param);
+        }
+
+        return params;
+    }
+
+    /**
+     * 生成删除语句
+     *
+     * @param orderItemDto
+     */
+    private JSONArray generateDeleteSql(OrderItemDto orderItemDto) {
+        JSONArray params = new JSONArray();
+        JSONObject param = null;
+        String sql = "";
+        String logText = orderItemDto.getLogText();
+
+        JSONObject logTextObj = JSONObject.parseObject(logText);
+        JSONArray preValues = logTextObj.getJSONArray("preValue");
+        for (int preValueIndex = 0; preValueIndex < preValues.size(); preValueIndex++) {
+            sql = "delete from " + orderItemDto.getActionObj() + " where 1=1 ";
+            param = new JSONObject();
+            JSONObject keyValue = preValues.getJSONObject(preValueIndex);
+            for (String key : keyValue.keySet()) {
+                sql += (" and " + key + "=" + keyValue.getString(key));
+            }
+            param.put("fallBackSql", sql);
+            params.add(param);
+        }
+
+        return params;
+    }
+
     @Override
     public ResponseEntity<String> createOrderItem(OrderItemDto orderItemDto) {
 
@@ -135,4 +280,36 @@ public class OIdServiceSMOImpl implements IOIdServiceSMO {
 
         return ResultVo.createResponseEntity(ResultVo.CODE_OK, ResultVo.MSG_OK);
     }
+
+    /**
+     * 完成事务
+     *
+     * @param orderDto
+     * @return
+     */
+    @Override
+    public ResponseEntity<String> finishOrder(OrderDto orderDto) {
+        if (StringUtil.isEmpty(orderDto.getoId())) {
+            return new ResponseEntity<String>("请求报文中未包含事务ID", HttpStatus.NOT_FOUND);
+        }
+
+        //完成订单项
+        Map info = new HashMap();
+        info.put("finishTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        info.put("statusCd", "C");
+        info.put("oId", orderDto.getoId());
+        centerServiceDAOImpl.updateOrderItem(info);
+
+        //删除 事务日志
+        centerServiceDAOImpl.deleteUnItemLog(info);
+
+        //完成订单
+        info = new HashMap();
+        info.put("finishTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        info.put("statusCd", "C");
+        info.put("oId", orderDto.getoId());
+        centerServiceDAOImpl.updateOrder(info);
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_OK, ResultVo.MSG_OK);
+    }
 }