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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/pay/PayOrderController.java

@@ -131,6 +131,7 @@ public class PayOrderController {
             }
             String ip = IpUtil.getIpAddr(request);
             Boolean payStatus = payOrderLogic.paid(orderId, authCode, ip, payType);
+            payOrderLogic.upIsPay(orderId);
             return ResponseHelper.success(payStatus);
         } finally {
             obtain.unlock();

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

@@ -191,6 +191,7 @@ public class PayOrderLogic {
         workerOrderBuy.setCreateTime(new Date());
         workerOrderBuy.setIdentity(currentCompanyWechat.getUser().getIdCard());
         workerOrderBuy.setUserId(currentCompanyWechat.getUser().getUserId());
+        workerOrderBuy.setOpenId(currentCompanyWechat.getUser().getMiniOpenId());
 
         if (StringUtil.isEmpty(workerOrderBuy.getCategoryId()))
             workerOrderBuy.setGoodsType("M");
@@ -604,8 +605,8 @@ public class PayOrderLogic {
                         adminWebsit.getPayWorkerCodeId(), workerOrder.getSource());
 
                 workerOrder.setTranscationId(transcationId);
-
                 workerOrder.setOpenId(currentCompanyWechat.getUser().getMiniOpenId());
+                workerOrder.setPayState(IsYesNoEnum.YES.getKey());
             }
 
 
@@ -1127,4 +1128,11 @@ public class PayOrderLogic {
                 .eq(Brand::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
                 .orderByAsc(Brand::getSortNum).list();
     }
+
+    public void upIsPay(String orderId) {
+        WorkerOrder workerOrder = workerOrderService.getById(orderId);
+        workerOrder.setPayState(IsYesNoEnum.YES.getKey());
+        workerOrder.setPayStateTime(new Date());
+        workerOrder.updateById();
+    }
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -336,6 +336,7 @@ public class UserLogic {
                     WebsitUser websitUser = new WebsitUser();
                     websitUser.setUserId(user.getUserId());
                     websitUser.setWebsitId(userWait.getWebsitId());
+                    websitUser.setWebsitName(userWait.getWebsitName());
                     websitUser.setExamineStatus(ExamineStatusEnum.OK.getKey());
                     websitUser.setExamineTime(new Date());
                     websitUser.setExamineRemark("初始化");

mall-server-api/src/main/java/com/gree/mall/manager/bean/policy/PolicyOrderEmVO.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.PolicyOrderEmStutasEnum;
 import com.gree.mall.manager.plus.entity.PolicyOrder;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,7 +23,7 @@ public class PolicyOrderEmVO    {
     private String id;
 
     @ApiModelProperty(value = "保单状态")
-    private String policyOrderStatus;
+    private PolicyOrderEmStutasEnum policyOrderStatus;
 
     @ApiModelProperty(value = "保单名称")
     private String policyName;

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -1250,9 +1250,13 @@ public class WechatLogic {
             log.info("商户扫码支付生成订单响应: {}", payResult);
         } catch (WxPayException e) {
             log.error("商户扫码支付失败: {}", payResult);
-            throw new RemoteServiceException("扫码支付失败,请检查二维码是否正确");
+            throw new RemoteServiceException("扫码支付失败,请检查二维码是否正确"+payResult.getErrCodeDes());
         }
         if (payResult == null || WxPayConstants.ResultCode.FAIL.equals(payResult.getReturnCode())) {
+
+            if (payResult.getErrCode().equals("USERPAYING"))
+                throw new RemoteServiceException("USERPAYING");
+
             throw new RemoteServiceException("扫码支付失败,请检查二维码是否正确");
         }
         //记录流水

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

@@ -645,8 +645,18 @@ public class AgreementLogic {
                 .eq(MailboxSendRecord::getReceiptStatus, IsYesNoEnum.NO.getKey()).list();
 
         for (MailboxSendRecord mailboxSendRecord : mailboxSendRecordList) {
-            Boolean rece = new EmailUtilsNew(mailbox.getSendMailbox(), mailbox.getSendPassword())
-                    .receEmail(mailbox.getAccidentMailbox(), mailboxSendRecord.getSendBatch());
+
+            Boolean b = false;
+
+            for (String s : mailbox.getAccidentMailbox().split(",")) {
+                Boolean rece = new EmailUtilsNew(mailbox.getSendMailbox(), mailbox.getSendPassword())
+                        .receEmail(s, mailboxSendRecord.getSendBatch());
+
+                if (rece)
+                    b=true;
+
+            }
+
 
             List<MailboxSendRecordPolicy> mailboxSendRecordPolicies = mailboxSendRecordPolicyService.lambdaQuery().in(MailboxSendRecordPolicy::getSendBatch, mailboxSendRecord.getSendBatch()).list();
 
@@ -654,7 +664,7 @@ public class AgreementLogic {
 
 
 
-            if (rece) {
+            if (b) {
 
 
                 mailboxSendRecord.setReceiptStatus(IsYesNoEnum.YES.getKey());

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -307,4 +307,10 @@ public class SettlementOrderLogic {
                 .eq(SettlementOrder::getStatus, SettlementStatusNewEnum.YC.getKey())
                 .set(SettlementOrder::getStatus, SettlementStatusNewEnum.LINE.getKey()).update();
     }
+
+    public void sync() {
+
+
+
+    }
 }

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

@@ -629,4 +629,5 @@ public class SettleOrderLogic {
             }
         }
     }
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/schedule/OrderBaseSchedule.java

@@ -4,9 +4,12 @@ import cn.hutool.core.date.DateUtil;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.gree.mall.manager.enums.workorder.OrderBaseStatusEnum;
 import com.gree.mall.manager.logic.common.WechatLogic;
+import com.gree.mall.manager.logic.websit.SettlementOrderLogic;
 import com.gree.mall.manager.logic.workorder.OrderBaseLogic;
+import com.gree.mall.manager.logic.workorder.SettleOrderLogic;
 import com.gree.mall.manager.plus.entity.PgOrderBase;
 import com.gree.mall.manager.plus.entity.SettlementOrder;
+import com.gree.mall.manager.plus.entity.WorkerOrder;
 import com.gree.mall.manager.plus.service.PgOrderBaseService;
 import com.gree.mall.manager.plus.service.SettlementOrderService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,6 +45,9 @@ public class OrderBaseSchedule {
     @Autowired
     WechatLogic wechatLogic;
 
+    @Autowired
+    SettlementOrderLogic settlementOrderLogic;
+
     /**
      * 生成抢单通知
      */
@@ -83,4 +89,16 @@ public class OrderBaseSchedule {
 
     }
 
+
+    /**
+     * 每五秒查询辅材支付情况
+     */
+    @Transactional
+    @Scheduled(fixedDelay = 5  * 1000)
+    //  @Scheduled(fixedDelay = 60  * 1000)
+    public void fucaizhifu() throws WxPayException {
+
+        settlementOrderLogic.sync();
+    }
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/schedule/SettlementSchedule.java

@@ -54,6 +54,14 @@ public class SettlementSchedule {
 
 */
 
+    //查辅材扫码支付失败的订单
+    @Scheduled(fixedDelay = 60 * 1000)
+    public void task() {
+
+
+    }
+
+
     /**服务结束改为服务结束
      *
      */