Browse Source

用户模块 筛选掉targetId为1的订阅,不计算进会员时间内
支付模块 增加支付日志打印

songfuqiang 2 years ago
parent
commit
523b0df6f4

+ 9 - 7
backend-core/src/main/java/cn/kdan/pdf/backend/core/service/impl/MemberServiceImpl.java

@@ -495,13 +495,15 @@ public class MemberServiceImpl implements MemberService {
 
         Date now = new Date();
         for (SubSetPricing setPricing : subSetPricingList) {
-            Date startDate = setPricing.getStartDate();
-            Date endDate = setPricing.getEndDate();
-            if (endDate.getTime() - now.getTime() > 0) {
-                if (startDate.getTime() - now.getTime() < 0) {
-                    num += endDate.getTime() - now.getTime();
-                } else {
-                    num += endDate.getTime() - startDate.getTime();
+            if(!"1".equals(setPricing.getTargetId())) {
+                Date startDate = setPricing.getStartDate();
+                Date endDate = setPricing.getEndDate();
+                if (endDate.getTime() - now.getTime() > 0) {
+                    if (startDate.getTime() - now.getTime() < 0) {
+                        num += endDate.getTime() - now.getTime();
+                    } else {
+                        num += endDate.getTime() - startDate.getTime();
+                    }
                 }
             }
         }

+ 1 - 0
backend-core/src/main/java/cn/kdan/pdf/backend/core/service/impl/OrderServiceImpl.java

@@ -524,6 +524,7 @@ public class OrderServiceImpl implements OrderService {
                     break;
                 }
                 String result = alipayService.query(outTradeNo);
+                log.info("支付宝回调查询结果:{}",result);
                 Map<String,Object> map = JSON.parseObject(result, Map.class);
                 Map<String,String> response = JSON.parseObject(map.get(RESPONSE).toString(), Map.class);
                 String tradeStatus = response.get(TRADE_STATUS);