diff --git a/src/main/java/com/peanut/modules/job/task/UserCourseBuyTask.java b/src/main/java/com/peanut/modules/job/task/UserCourseBuyTask.java index 349cdff6..d2957b01 100644 --- a/src/main/java/com/peanut/modules/job/task/UserCourseBuyTask.java +++ b/src/main/java/com/peanut/modules/job/task/UserCourseBuyTask.java @@ -32,7 +32,7 @@ public class UserCourseBuyTask implements ITask{ //查询前一天新开的课 PreparedStatement classStatement = yljkconn.prepareStatement("select tc.superVIP,tc.cellPhone,tctc.* from t_customer_taihu_class tctc " + "left join t_customer tc on tc.oid = tctc.customerOid " + - "where tctc.valid = 1 and tctc.status = '10' and DATE(tctc.createDate) > DATE('"+DateUtil.format(DateUtils.addDays(new Date(),-1),"yyyy-MM-dd")+"') and tc.superVIP = '0' "); + "where tctc.valid = 1 and tctc.status = '10' and DATE(tctc.createDate) > DATE('"+DateUtil.format(DateUtils.addDays(new Date(),-2),"yyyy-MM-dd")+"') and tc.superVIP = '0' "); ResultSet classResultSet = classStatement.executeQuery(); System.out.println("userCourseBuy数据统计完成-----"); while (classResultSet.next()) { diff --git a/src/main/java/com/peanut/modules/pay/IOSPay/constant/VerifyReceiptConstant.java b/src/main/java/com/peanut/modules/pay/IOSPay/constant/VerifyReceiptConstant.java index ba84101c..221f94bb 100644 --- a/src/main/java/com/peanut/modules/pay/IOSPay/constant/VerifyReceiptConstant.java +++ b/src/main/java/com/peanut/modules/pay/IOSPay/constant/VerifyReceiptConstant.java @@ -11,6 +11,7 @@ public interface VerifyReceiptConstant { String APP_BUNDLE_IDENTIFIER = "com.cn.nuttyreading"; String MEDICINE_APP_BUNDLE_IDENTIFIER = "com.cn.medicine"; + String ZMZM_APP_BUNDLE_IDENTIFIER = "com.cn.zmzm"; String URL_SANDBOX = "https://sandbox.itunes.apple.com/verifyReceipt"; String URL_VERIFY = "https://buy.itunes.apple.com/verifyReceipt"; diff --git a/src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java b/src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java index ef79af85..0f7cd7dc 100644 --- a/src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java +++ b/src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java @@ -91,17 +91,19 @@ public class AppController { if (order01 == null ) { // 3.1 校验bundle id if (!receipt.getReceipt().getBundle_id().equals(VerifyReceiptConstant.APP_BUNDLE_IDENTIFIER)&& - !receipt.getReceipt().getBundle_id().equals(VerifyReceiptConstant.MEDICINE_APP_BUNDLE_IDENTIFIER)) { + !receipt.getReceipt().getBundle_id().equals(VerifyReceiptConstant.MEDICINE_APP_BUNDLE_IDENTIFIER)&& + !receipt.getReceipt().getBundle_id().equals(VerifyReceiptConstant.ZMZM_APP_BUNDLE_IDENTIFIER)) { return Result.error1(); } if (receipt.getStatus().equals("0")) { IapResponseDTO.AppleOrder appleOrder = receipt.getReceipt().getIn_app()[0]; + System.out.println("开始进入判断3"+appleOrder.getTransaction_id()+"====="+dto.getTransactionId()+"====="+ + appleOrder.getProduct_id()+"====="+dto.getProductId()); if (appleOrder.getTransaction_id().equals(dto.getTransactionId()) && //p+productid为吴门医述商品,单id为疯子读书商品 (appleOrder.getProduct_id().equals(dto.getProductId())|| - appleOrder.getProduct_id().equals("p"+dto.getProductId()))) { - System.out.println("开始进入判断3"+appleOrder.getTransaction_id()+"====="+dto.getTransactionId()+"====="+ - appleOrder.getProduct_id()+"====="+dto.getProductId()); + appleOrder.getProduct_id().equals("p"+dto.getProductId())|| + appleOrder.getProduct_id().equals("Z"+dto.getProductId()))) { order.setOrderid(dto.getOrderId()); order.setReceiptData(dto.getReceiptData()); order.setProductID(dto.getProductId());