ias 修复

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/OrderServiceHandler.java

@@ -40,6 +40,8 @@ public class OrderServiceHandler extends AbstractIasServiceHandler<OrderServiceC
     private OrderCancelManager orderCancelManager;
     @Autowired
     private OrderTransactionManager orderTransactionManager;
+    @Autowired
+    private GetH5UrlManager getH5UrlManager;
 
     @Override
     protected <T extends AbstractSignTypeRequest<?>> AbstractSignTypeResponse handleInternal(T request, SignJsonRequest jsonReq, AbstractHttpRequestInfo reqInfo) throws ServiceHandleException {
@@ -67,6 +69,8 @@ public class OrderServiceHandler extends AbstractIasServiceHandler<OrderServiceC
                 return orderCancelManager.serviceHandle((OrderCancelRequest)request, jsonReq.getIfCode(), jsonReq.getReqId(), reqInfo);
             case TRANSACTION:
                 return orderTransactionManager.serviceHandle((OrderTransactionRequest)request, jsonReq.getIfCode(), jsonReq.getReqId(), reqInfo);
+            case GETH5URL:
+                return getH5UrlManager.serviceHandle((GetH5UrlRequest)request,jsonReq.getIfCode(),jsonReq.getReqId(),reqInfo);
             default:
                 throw FileProtocolSystemError.NOT_SUPPORT.toHandleException(jsonReq.getIfCode());
         }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/GetH5UrlManager.java

@@ -78,6 +78,6 @@ public class GetH5UrlManager extends AbstractOrderManager<GetH5UrlRequest>{
         res.setQdOrderNo(req.getQdOrderNo());
         res.setOrderNo(response.getOrderNo());
         res.setReceiveTime(LocalDateTime.now().format(TimeTools.ISO_LOCAL_DATE_TIME));
-        return response;
+        return res;
     }
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ygz/AgencyChannelMapperManagerImpl.java

@@ -62,7 +62,7 @@ public class AgencyChannelMapperManagerImpl extends AbstractManager implements A
         List<QtkAgency> qtkAgencyMapList = qtkAgencyRepo.findAll();
         List<QtkServiceHall> qtkServiceHallList = qtkServicehallRepo.findAll();
         agencyMap = qtkAgencyMapList.parallelStream().collect(Collectors.toMap(QtkAgency::getAgencyId, m -> m));
-        serviceHallMap = qtkServiceHallList.parallelStream().collect(Collectors.toMap(QtkServiceHall::getAgencyId, m -> m));
+        serviceHallMap = qtkServiceHallList.parallelStream().collect(Collectors.toMap(QtkServiceHall::getServiceHallId, m -> m));
         logger.debug("AgencyChannelMap Cache Updated.");
     }
 

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/web/JsonPostServiceController.java

@@ -9,6 +9,12 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
+import cn.com.taiji.common.pub.json.JsonTools;
+import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
+import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
+import cn.com.taiji.ias.manager.order.GetH5UrlManager;
+import cn.hutool.json.JSONUtil;
 import org.apache.skywalking.apm.toolkit.trace.Tag;
 import org.apache.skywalking.apm.toolkit.trace.Trace;
 import org.apache.skywalking.apm.toolkit.trace.TraceContext;
@@ -52,4 +58,23 @@ public class JsonPostServiceController extends BaseJsonPostController {
         response.setCharacterEncoding("UTF-8");
         super.handleComm(req, req.getReqId(), handleManager, request, response);
     }
+
+    @Autowired
+    private GetH5UrlManager getH5UrlManager;//  测试用
+    @CrossOrigin
+    @RequestMapping(value = "/cc/test/json", method = RequestMethod.POST)
+    public Object test(@RequestBody String jsonStr, HttpServletRequest request, HttpServletResponse response)
+            throws Exception {
+        String fullClassName = JSONUtil.parseObj(jsonStr).getStr("fullClassName");
+        @SuppressWarnings("unchecked")
+        Class<? extends AbstractSignTypeRequest<?>> aClass =
+                (Class<? extends AbstractSignTypeRequest<?>>)Class.forName(fullClassName);
+        AbstractSignTypeRequest<?> req = JsonTools.json2ObjectSilent(jsonStr, aClass);
+        AbstractSignTypeResponse res = null;
+        try {
+            return getH5UrlManager.jsonPostRepeat(req);
+        } catch (ServiceHandleException e) {
+            return "错误码:\n" + e.getErrCode() + "\n错误信息:\n" + e.getMessage();
+        }
+    }
 }