苹果支付。

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrdersServiceImpl.java

@@ -100,49 +100,44 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
     public DragonPayBaseRespDto dragonNotifyApple(DragonPayBaseReqDto dragonPayBaseReqDto) {
         //1 调用苹果查询结果
         String verifyResult = buyAppVerify(dragonPayBaseReqDto.getReceiptData());
+        //第二部
+        //持久化通知记录
+        dragonServiceCommonBiz.createDragonOrderLogs(dragonPayBaseReqDto.getCode(),dragonPayBiz.getPaymentType(dragonPayBaseReqDto.getPayType(),dragonPayBaseReqDto.getDeviceFrom()),verifyResult);
         if (verifyResult == null) {
             // 苹果服务器没有返回验证结果
             log.info("苹果支付，app调用，查不到订单信息");
             return null;
         } else {
             JSONObject job = JSONObject.parseObject(verifyResult);
-            String states = job.getString("status");
-            if (states.equals("0")){ // 前端所提供的收据是有效的    验证成功
-                String r_receipt = job.getString("receipt");
+            Integer states = job.getInteger("status");
+            if (states==0){ // 前端所提供的收据是有效的    验证成功
+      /*          String r_receipt = job.getString("receipt");
                 JSONObject returnJson = JSONObject.parseObject(r_receipt);
                 String in_app = returnJson.getString("in_app");
                 JSONObject in_appJson = JSONObject.parseObject(in_app.substring(1, in_app.length() - 1));
-             /*   ApplePayRefundDto applePayRefundDto=ApplePayRefundDto.getNew();*/
                 String product_id = in_appJson.getString("product_id");
-                /*applePayRefundDto.setProductId(product_id);*/
-                String transaction_id = in_appJson.getString("transaction_id");   // 订单号
+                String transaction_id = in_appJson.getString("transaction_id");   // 订单号*/
                 //如果单号一致  则开始处理逻辑
-                if(dragonPayBaseReqDto.getTransactionId().equals(transaction_id)){
-                    //判断是已经查过了。
-                    DragonPayBaseRespDto dragonPayBaseRespDto=dataUtils.getDragonPayBaseRespDto(dragonPayBaseReqDto.getOrderCode());
-                    if(null!=dragonPayBaseRespDto){
-                        return dragonPayBaseRespDto;
-                    }
-                    /*String[] moneys = product_id.split("\\.");//实际支付金额*/
-                    //此处开始业务逻辑
-                    //2 插入支付该支付的东西（预支付的东西）//dragon_orders
-                    dragonServiceCommonBiz.buildPayOrders(dragonPayBaseReqDto,null);
-                    //第二部
-                    //持久化通知记录
-                    dragonServiceCommonBiz.createDragonOrderLogs(dragonPayBaseReqDto.getCode(),dragonPayBiz.getPaymentType(dragonPayBaseReqDto.getPayType(),dragonPayBaseReqDto.getDeviceFrom()),verifyResult);
-                    //修改状态
-                    applepay.completeSuccessOrder(dataUtils.getPayOrderByCode(dragonPayBaseReqDto.getCode()),transaction_id,verifyResult);
-                    //
-                    DragonPayBaseRespDto respDto = buildCommonRespDto(dragonPayBaseReqDto);
-                    respDto.setProductId(product_id);
-                    dataUtils.createAPPLePayOrder(dragonPayBaseReqDto.getOrderCode(),respDto);
-                    return respDto;
+                //判断是已经查过了。
+                DragonPayBaseRespDto dragonPayBaseRespDto=dataUtils.getDragonPayBaseRespDto(dragonPayBaseReqDto.getOrderCode());
+                if(null!=dragonPayBaseRespDto){
+                    return dragonPayBaseRespDto;
                 }
+                /*String[] moneys = product_id.split("\\.");//实际支付金额*/
+                //此处开始业务逻辑
+                //2 插入支付该支付的东西（预支付的东西）//dragon_orders
+                dragonServiceCommonBiz.buildPayOrders(dragonPayBaseReqDto,null);
+                //修改状态
+                applepay.completeSuccessOrder(dataUtils.getPayOrderByCode(dragonPayBaseReqDto.getCode()),dragonPayBaseReqDto.getTransactionId(),verifyResult);
+                //
+                DragonPayBaseRespDto respDto = buildCommonRespDto(dragonPayBaseReqDto);
+                respDto.setStatus(0);
+                dataUtils.createAPPLePayOrder(dragonPayBaseReqDto.getOrderCode(),respDto);
+                return respDto;
             } else {
                 return null;
             }
         }
-        return null;
     }
     public  String buyAppVerify(String receipt) {
         try{