Merge remote-tracking branch 'origin/master'

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/appplus/fz/ThirdAppPlusWechatFzServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.json.JSONUtil;
 import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum;
 import com.bsd.pjcloud.thirdparty.config.AppPlusPayConfig;
 import com.bsd.pjcloud.thirdparty.constant.fz.ThirdFzOrderStatusEnum;
+import com.bsd.pjcloud.thirdparty.constant.pay.ThirdPayOrderStatusEnum;
 import com.bsd.pjcloud.thirdparty.entity.pay.ThirdFzOrderEntity;
 import com.bsd.pjcloud.thirdparty.entity.pay.ThirdPayOrderEntity;
 import com.bsd.pjcloud.thirdparty.mapper.pay.ThirdFzOrderMapper;
@@ -59,6 +60,11 @@ public class ThirdAppPlusWechatFzServiceImpl implements ThirdAppPlusWechatFzServ
             log.info("|{}|订单金额太小,无需分账,订单号:{}", TAG, orderEntity.getPayNo());
             return null;
         }
+        // 订单必须为支付成功
+        if (ObjectUtil.notEqual(ThirdPayOrderStatusEnum.PAY_SUCCESS.getType(), orderEntity.getStatus())) {
+            log.info("|{}|订单状态不为'支付成功',无需分账,订单:{}", TAG, JSONUtil.toJsonStr(orderEntity));
+            return null;
+        }
         // 目前理论之能分一次账
         ThirdFzOrderEntity fzOrderDetail = fzOrderService.getByPayNo(orderEntity.getPayNo());
         if (ObjectUtil.isNotEmpty(fzOrderDetail)) {