Merge branch 'feature-dingwf-0715' into develop

project-order/src/main/java/com/dituhui/pea/order/service/impl/CommonServiceImpl.java

@@ -134,6 +134,12 @@ public class CommonServiceImpl implements CommonService {
 
 
     public void addOrderEvent(String orderId, String subOrderId, String source, String operator, String event, String content, String memo) {
     public void addOrderEvent(String orderId, String subOrderId, String source, String operator, String event, String content, String memo) {
         OrderEventEntity entity = new OrderEventEntity();
         OrderEventEntity entity = new OrderEventEntity();
+        if (StringUtils.isBlank(source)){
+            source = "SYSTEM";
+        }
+        if (StringUtils.isBlank(operator)){
+            operator = "PEA-WEB";
+        }
         entity.setOrderId(orderId).setSuborderId(subOrderId).setSource(source).setOperator(operator);
         entity.setOrderId(orderId).setSuborderId(subOrderId).setSource(source).setOperator(operator);
         entity.setEvent(event).setDescription(content).setMemo(memo);
         entity.setEvent(event).setDescription(content).setMemo(memo);
         entity.setCreateTime(LocalDateTime.now()).setUpdateTime(LocalDateTime.now());
         entity.setCreateTime(LocalDateTime.now()).setUpdateTime(LocalDateTime.now());