Merge remote-tracking branch 'origin/feature/许可账号购买二期' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/licence/LicenceOrderApiServiceImpl.java

@@ -344,12 +344,14 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
         String date_time = formatter.format(new Date(Long.valueOf(timeStamp) * 1000L));
         Date date = DateUtil.strToDate(date_time, DateUtil.FORMAT_DATETIME_19);
         if (order == null) {
+            logger.info("该笔订单不存在！");
             RedisUtil.unlock(key);
             return ServiceResponse.success(false);
         }
         if ("license_pay_success".equals(infoType)) {
-            if (order.getQywxPayTime() != null) {
+            if (order.getQywxPayTime() != null && order.getQywxOrderStatus() != 0) {
                 //该笔订单已处理
+                logger.info("该笔订单已处理！");
                 RedisUtil.unlock(key);
                 return ServiceResponse.success(false);
             }
@@ -361,6 +363,7 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
         if ("license_refund".equals(infoType)) {
             if (order.getQywxRefundTime() != null) {
                 //该笔订单已处理
+                logger.info("该笔订单已处理！");
                 RedisUtil.unlock(key);
                 return ServiceResponse.success(false);
             }