需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -441,14 +441,7 @@ public class PayOrderLogic {
         workerOrder.setSource(commonLogic.getSource().equals("A")?OrderInfoSourceEnum.A.getRemark():OrderInfoSourceEnum.B.getRemark() );
 
 
-        if (!StringUtil.isEmpty(workerOrder.getWorkerOrderId())){
-            PgOrderBase pgOrderBase = pgOrderBaseService.getById(workerOrder.getWorkerOrderId());
-            if (pgOrderBase != null){
-                workerOrder.setSaleType(pgOrderBase.getSaleType());
-                workerOrder.setOrderSmallType(pgOrderBase.getOrderSmallType());
-                workerOrder.setOrderSmallTypeText(pgOrderBase.getOrderSmallTypeText());
-            }
-        }
+
 
 
         workerOrder.setPayTime(new Date());
@@ -1188,6 +1181,15 @@ public class PayOrderLogic {
         workerOrder.setPayStateTime(new Date());
         workerOrder.setOpenId(currentCompanyWechat.getUser().getMiniOpenId());
 
+        if (!StringUtil.isEmpty(workerOrder.getWorkerOrderId())){
+            PgOrderBase pgOrderBase = pgOrderBaseService.getById(workerOrder.getWorkerOrderId());
+            if (pgOrderBase != null){
+                workerOrder.setSaleType(pgOrderBase.getSaleType());
+                workerOrder.setOrderSmallType(pgOrderBase.getOrderSmallType());
+                workerOrder.setOrderSmallTypeText(pgOrderBase.getOrderSmallTypeText());
+            }
+        }
+
         if (StringUtil.isEmpty(workerOrder.getOpenId())){
             throw new RemoteServiceException("师傅身份Oppid获得失败，请重新进入小程序，授权用户信息，发起支付");
         }

mall-server-api/src/main/java/com/gree/mall/manager/utils/email/EmailUtilsNew.java

@@ -179,7 +179,7 @@ public class EmailUtilsNew {
         Message[] messages = inbox.getMessages();
 
         int mailCounts = messages.length;
-        for(int i = messages.length-1; i > messages.length -30; i--) {
+        for(int i = messages.length-1; i > messages.length -100; i--) {
 
             String subject = messages[i].getSubject();
             String from = (messages[i].getFrom()[0]).toString();
@@ -191,7 +191,6 @@ public class EmailUtilsNew {
             if (!subject.split("-")[1].equals(sendBatch) ){
                 continue;
             }
-            //今天接收的邮件
             if(from.indexOf(receEmail) > -1){
                 messages[i].setFlag(Flags.Flag.SEEN, true);
                 inbox.close(false);