managew 领取订单和审核订单通过ias处理

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderExamineManageImpl.java

@@ -17,6 +17,10 @@ import cn.com.taiji.core.manager.tools.issue.IssueTools;
 import cn.com.taiji.core.model.comm.protocol.ats.model.CallbackModel;
 import cn.com.taiji.core.model.comm.protocol.ats.notice.AtsChannelNoticeRequest;
 import cn.com.taiji.core.model.comm.protocol.ats.notice.AtsChannelNoticeResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.order.OrderAuditRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.order.OrderAuditResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.order.OrderReceiveRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.order.OrderReceiveResponse;
 import cn.com.taiji.core.model.comm.protocol.ifmw.GetKeyRequest;
 import cn.com.taiji.core.model.comm.protocol.ifmw.GetKeyResponse;
 import cn.com.taiji.core.repo.jpa.basic.QtkBrandInfoRepo;
@@ -72,14 +76,20 @@ public class IssueOrderExamineManageImpl extends AbstractManagewManager implemen
 
     @Override
     public void receive(OrderDetailReqDTO reqDto) throws ManagerException {
-        IssueOrderinfo order = issueOrderinfoRepo.findByOrderNo(reqDto.getOrderNo());
-        if (order == null) throw new ManagerException("此订单不存在");
-        order.setReceiveStatus(true);
-        order.setReceiveTime(LocalDateTime.now());
-        Staff staff = staffRepo.findByStaffId(reqDto.getStaffId());
-        order.setReceiver(staff.getOpenId());
-        issueOrderinfoRepo.merge(order);
-        sysPersistOperateLog(OperateType.ORDER_RECEIVE, order.getId(), reqDto.getOrderSource(), staff.getOpenId(), "发行订单领取");
+//        IssueOrderinfo order = issueOrderinfoRepo.findByOrderNo(reqDto.getOrderNo());
+//        if (order == null) throw new ManagerException("此订单不存在");
+//        order.setReceiveStatus(true);
+//        order.setReceiveTime(LocalDateTime.now());
+//        Staff staff = staffRepo.findByStaffId(reqDto.getStaffId());
+//        order.setReceiver(staff.getOpenId());
+//        issueOrderinfoRepo.merge(order);
+//        sysPersistOperateLog(OperateType.ORDER_RECEIVE, order.getId(), reqDto.getOrderSource(), staff.getOpenId(), "发行订单领取");
+
+        OrderReceiveRequest request = new OrderReceiveRequest();
+        request.setOrderNo(reqDto.getOrderNo());
+        request.setStaffId(reqDto.getStaffId());
+        OrderReceiveResponse response = jsonPostRepeat(request);
+        sysPersistOperateLog(OperateType.ORDER_RECEIVE, response.getId(), reqDto.getOrderSource(), findOpenIdByToken(reqDto.getAccessToken()), "发行订单领取");
 
     }
 
@@ -87,16 +97,19 @@ public class IssueOrderExamineManageImpl extends AbstractManagewManager implemen
     public void examine(OrderExamineReqDTO reqDto) throws ManagerException {
         //格式校验
         reqDto.validate();
-        //业务校验
-        IssueOrderinfo order = issueOrderinfoRepo.findByOrderNo(reqDto.getOrderNo());
-        if (order == null) throw new ManagerException("此订单不存在");
-        Staff staff = staffRepo.findByStaffId(reqDto.getStaffId());
-        if (!staff.getOpenId().equals(order.getReceiver())) {
-            throw new ManagerException("审核订单的人与领取订单的人不一致，不允许审核");
-        }
-        //处理业务逻辑
-        doBussines(reqDto, order, staff);
-        sysPersistOperateLog(OperateType.ORDER_EXAMINE, order.getId(), reqDto.getOrderSource(), staff.getOpenId(), "发行订单审核");
+//        //业务校验
+//        IssueOrderinfo order = issueOrderinfoRepo.findByOrderNo(reqDto.getOrderNo());
+//        if (order == null) throw new ManagerException("此订单不存在");
+//        Staff staff = staffRepo.findByStaffId(reqDto.getStaffId());
+//        if (!staff.getOpenId().equals(order.getReceiver())) {
+//            throw new ManagerException("审核订单的人与领取订单的人不一致，不允许审核");
+//        }
+//        //处理业务逻辑
+//        doBussines(reqDto, order, staff);
+//        sysPersistOperateLog(OperateType.ORDER_EXAMINE, order.getId(), reqDto.getOrderSource(), staff.getOpenId(), "发行订单审核");
+        OrderAuditRequest request = copyProperties(reqDto, new OrderAuditRequest());
+        OrderAuditResponse response = jsonPostRepeat(request);
+        sysPersistOperateLog(OperateType.ORDER_EXAMINE, response.getId(), reqDto.getOrderSource(), findOpenIdByToken(reqDto.getAccessToken()), "发行订单审核");
     }
 
     @Transactional(rollbackFor = Exception.class)