Merge remote-tracking branch 'origin/master'

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

@@ -424,31 +424,12 @@ public class PayOrderLogic {
             final User user = userService.getById(workerOrder.getUserId());
             workerOrder.setIdentity(user.getIdCard());
         }
-
         List<WorkerOrderItem> workerOrderItems = workerOrderItemService.lambdaQuery().eq(WorkerOrderItem::getOrderId, workerOrder.getOrderId()).list();
 
-        for (WorkerOrderItem workerOrderItem : workerOrderItems) {
-            if (websitNormChargeService.lambdaQuery().eq(WebsitNormCharge::getNormName,workerOrderItem.getGoodsName())
-                    .eq(WebsitNormCharge::getNormType,"M").count() < 1
-                    && partsImportService.lambdaQuery().eq(PartsImport::getPartName,workerOrderItem.getGoodsName())
-                    .count() < 1
-            ) {
-                workerOrderItem.setChargeType("SERV");
-            }
-
-        }
-
         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 +1169,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获得失败，请重新进入小程序，授权用户信息，发起支付");
         }
@@ -1197,6 +1187,18 @@ public class PayOrderLogic {
         }else {
             workerOrder.updateById();
         }
+
+        List<WorkerOrderItem> workerOrderItems = workerOrderItemService.lambdaQuery().eq(WorkerOrderItem::getOrderId, workerOrder.getOrderId()).list();
+
+        for (WorkerOrderItem workerOrderItem : workerOrderItems) {
+            if (partsImportService.lambdaQuery().eq(PartsImport::getPartName,workerOrderItem.getGoodsName())
+                    .count() > 0
+            ) {
+                workerOrderItem.setChargeType("SERV");
+                workerOrderItem.updateById();
+            }
+
+        }
         return workerOrder;
     }
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -609,7 +609,9 @@ public class AgreementLogic {
 
 
         //意外保险发送邮件
-        List<PolicyOrder> policyOrders = policyOrderService.lambdaQuery().eq(PolicyOrder::getType, PolicyTypeEnum.AC.getKey())
+        List<PolicyOrder> policyOrders = policyOrderService.lambdaQuery()
+                .le(PolicyOrder::getCreateTime,endTime)
+                .eq(PolicyOrder::getType, PolicyTypeEnum.AC.getKey())
                 .eq(PolicyOrder::getIsPay, IsYesNoEnum.YES.getKey())
                 .eq(PolicyOrder::getIsSend, IsYesNoEnum.NO.getKey()).list();
 
@@ -681,7 +683,7 @@ public class AgreementLogic {
         List<MailboxReceive> mailboxReceives = mailboxReceiveService.lambdaQuery().eq(MailboxReceive::getMailboxId, mailbox.getId()).list();
 
         List<MailboxSendRecord> mailboxSendRecordList = mailboxSendRecordService.lambdaQuery()
-                .between(MailboxSendRecord::getSendTime, DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()))
+                .between(MailboxSendRecord::getSendTime, DateUtil.beginOfDay(DateUtil.offsetDay(new Date(),-3)), DateUtil.endOfDay(new Date()))
                 .eq(MailboxSendRecord::getReceiptStatus, IsYesNoEnum.NO.getKey()).list();
 
         for (MailboxSendRecord mailboxSendRecord : mailboxSendRecordList) {
@@ -1145,6 +1147,7 @@ public class AgreementLogic {
 
         //雇主保险发送邮件
         List<PolicyOrder> policyOrdersEm = policyOrderService.lambdaQuery()
+                .le(PolicyOrder::getCreateTime,endTime)
                 .eq(PolicyOrder::getType, PolicyTypeEnum.EM.getKey())
                 .eq(PolicyOrder::getIsImport, IsYesNoEnum.NO.getKey())
                 .eq(PolicyOrder::getIsSend, IsYesNoEnum.NO.getKey()).list();
@@ -1339,6 +1342,7 @@ public class AgreementLogic {
 
             EmailUtilsNew emailUtilsNew = new EmailUtilsNew(mailbox.getSendMailbox(), mailbox.getSendPassword());
             List<PolicyOrder> policyOrdersIn = policyOrderService.lambdaQuery()
+                    .le(PolicyOrder::getCreateTime,endTime)
                     .eq(PolicyOrder::getType, PolicyTypeEnum.IN.getKey())
                     .eq(PolicyOrder::getIsImport, IsYesNoEnum.NO.getKey())
                     .eq(PolicyOrder::getBuyUnitId, mailboxReceive.getDictId())

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 -20; i--) {
+        for(int i = messages.length-1; i > messages.length -30; i--) {
 
             String subject = messages[i].getSubject();
             String from = (messages[i].getFrom()[0]).toString();
@@ -191,8 +191,7 @@ public class EmailUtilsNew {
             if (!subject.split("-")[1].equals(sendBatch) ){
                 continue;
             }
-            //今天接收的邮件
-            if(receivedDate.getTime() > DateUtil.beginOfDay(new Date()).getTime() && from.indexOf(receEmail) > -1){
+            if(from.indexOf(receEmail) > -1){
                 messages[i].setFlag(Flags.Flag.SEEN, true);
                 inbox.close(false);
                 store.close();