Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	topsun/src/main/java/com/huigou/topsun/ep/order/application/impl/EpSaleOrderCancelApplicationImpl.java

topsun/src/main/java/com/huigou/topsun/ep/order/application/impl/EpSaleOrderCancelApplicationImpl.java

@@ -59,8 +59,6 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
     @Autowired
     private EpSaleOrderCancelItemApplication epSaleOrderCancelItemApplication;
     @Autowired
-    private EpSaleOrderItemApplication epSaleOrderItemApplication;
-    @Autowired
     private HttpClient httpClient;
     @Resource
     private WorkflowApplication workflowApplication;
@@ -207,6 +205,25 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
     public void saveEpSaleOrderCancelVo(List<EpSaleOrderCancelVo> epSaleOrderCancelVos) {
         for (EpSaleOrderCancelVo epSaleOrderCancelVo : epSaleOrderCancelVos) {
             EpSaleOrderCancel epSaleOrderCancel = new EpSaleOrderCancel();
+            BeanUtil.copyProperties(epSaleOrderCancelVo,epSaleOrderCancel);
+
+            //初始化用户信息
+            String personCode = epSaleOrderCancelVos.get(0).getPersonCode();
+            QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery("config/topsun/ep/epSaleOrder/epSaleOrder.xml", "loadPersonMemberId");
+            String personMemberId = this.sqlExecutorDao.queryToString(queryDescriptor.getSql(), personCode);
+            if (StringUtil.isBlank(personMemberId)){
+                throw new RuntimeException("未找到编码为：" + personCode + " 的人员");
+            }
+            //String createdById = SystemCache.getParameter("adminPersonId", String.class);
+            Operator operator = operatorApplication.createOperatorByPersonMemberId(personMemberId);
+            epSaleOrderCancel.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
+            SDO localSdo = new SDO();
+            localSdo.setOperator(operator);
+            Map<String, Object> formData = BeanUtil.beanToMap(epSaleOrderCancel);
+            String bizId = this.startProcessInstance(EpSaleOrderCancelApplication.PROCESS_DEFINITION_KEY, formData, localSdo);
+            epSaleOrderCancel.setId(bizId);
+            epSaleOrderCancel.setStatusId(BizBillStatus.APPROVING.getId());
+            epSaleOrderCancel = epSaleOrderCancelRepository.save(epSaleOrderCancel);
             BeanUtil.copyProperties(epSaleOrderCancelVo, epSaleOrderCancel);
                 //初始化用户信息
                 String personCode = epSaleOrderCancelVos.get(0).getPersonCode();