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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderLogLogic.java

@@ -49,7 +49,7 @@ public class OrderLogLogic {
                 .eq(StringUtils.isNotBlank(currentCompanyWechat.getCompanyWechatId()),
                         PgOrderOperatorLog::getCompanyWechatId,
                         currentCompanyWechat.getCompanyWechatId())
-                .orderByDesc(PgOrderOperatorLog::getId)
+                .orderByDesc(PgOrderOperatorLog::getCreateTime)
                 .list();
         return list;
     }
@@ -309,7 +309,7 @@ public class OrderLogLogic {
 
         PgOrderBase pgOrderBaseUp = new PgOrderBase();
         pgOrderBaseUp.setId(pgOrderBase.getId());
-        pgOrderBaseUp.setLastOperator(content);
+        pgOrderBaseUp.setLastOperator("【JSM】" + content);
         pgOrderBaseUp.setLastOperatorWebsit(websitName);
         pgOrderBaseUp.setLastOperatorTime(new Date());
         pgOrderBaseUp.updateById();

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderLogLogic.java

@@ -24,7 +24,6 @@ import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.StringUtil;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang.time.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -421,7 +420,7 @@ public class OrderLogLogic {
         }
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
         PgOrderOperatorLog pgOrderOperatorLog = new PgOrderOperatorLog();
-        pgOrderOperatorLog.setContent(content);
+        pgOrderOperatorLog.setContent("【JSM】" + content);
         pgOrderOperatorLog.setType(type);
         pgOrderOperatorLog.setOrderBaseId(orderBaseId);
         if(adminUser != null && adminUser.getAdminWebsit() != null) {
@@ -433,7 +432,7 @@ public class OrderLogLogic {
         pgOrderOperatorLog.setCompanyWechatName(pgOrderBase.getCompanyWechatName());
         pgOrderOperatorLog.insert();
 
-        pgOrderBase.setLastOperator(content);
+        pgOrderBase.setLastOperator("【JSM】" + content);
         pgOrderBase.setLastOperatorWebsit(websitName);
         pgOrderBase.setLastOperatorTime(new Date());
         pgOrderBase.updateById();