managew

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

@@ -288,11 +288,13 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
         if (SourceType.CHANNEL.equals(order.getOrderSource())) {//因为涉及到退费，退费由渠道自己处理
             throw new ManagerException("渠道订单不支持在综合业务平台取消");
         }
+        String openId = findOpenIdByToken(reqDto.getAccessToken());
         OrderCancelRequest request = copyProperties(reqDto, new OrderCancelRequest());
-        request.setOpenId(findOpenIdByToken(reqDto.getAccessToken()));
+        request.setOpenId(openId);
         request.setStaffNum(reqDto.getStaffId());
         request.setRefundStatus(0);
         jsonPostRepeat(request);
+        sysPersistOperateLog(OperateType.ORDER_CANCEL,order.getId(),reqDto.getOrderSource(), openId,"订单取消");
     }
 
     @Override
@@ -508,6 +510,7 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
         request.setOpenId(findOpenIdByToken(reqDto.getAccessToken()));
         Staff staff = staffRepo.findByStaffId(reqDto.getStaffId());
         request.setServiceHallId(staff.getServiceHallId());
+        request.setRechangeMode(2);
         ReturnGoodsResponse response = jsonPostRepeat(request);
         sysPersistOperateLog(OperateType.ORDER_RETURNAPPLY, response.getId(), reqDto.getOrderSource(), request.getOpenId(),"发行订单退货申请");
         return response.getMsg();