苹果支付、开发。

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/dto/DragonPayBaseRespDto.java

@@ -38,6 +38,9 @@ public class DragonPayBaseRespDto implements Serializable {
 
     private String payType;
 
+    private String productId;
+
+
     @Data
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public static class PayData{

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/service/IDragonOrdersService.java

@@ -15,5 +15,5 @@ public interface IDragonOrdersService {
     DragonPayOrderQueryRespDto checkOrderStatusByCode(String code);
 
     boolean manulNotify(String code);
-    void  dragonNotifyApple(DragonPayBaseReqDto dragonPayBaseReqDto);
+    DragonPayBaseRespDto  dragonNotifyApple(DragonPayBaseReqDto dragonPayBaseReqDto);
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/impl/AbstractPayChannelStrategyImpl.java

@@ -65,6 +65,17 @@ public abstract class AbstractPayChannelStrategyImpl implements IPayChannelStrat
         //通知商户
         return dragonPayBiz.sendNotify(dragonPayBiz.buildPayNotifyReqBo(dragonOrdersDto));
     }
+    @Transactional(rollbackFor = Exception.class)
+    public void completeSuccessOrderNoNotify(DragonOrdersDto dragonOrdersDto, String bankTrxNo, LocalDateTime timeEnd, String bankReturnMsg) {
+        log.info("订单支付成功!");
+        dragonOrdersDto.setPaymentAt(timeEnd);
+        dragonOrdersDto.setPaymentId(bankTrxNo);// 设置银行流水号
+        dragonOrdersDto.setStatus(Integer.parseInt(DragonConstant.PayStatusEnum.STATUS_PAID.getCode()));
+        //更新缓存
+        dataUtils.updateOrderStatus(dragonOrdersDto.getCode(),dragonOrdersDto);
+        //修改订单状态
+        dragonServiceCommonBiz.updateOrderStatus(dragonOrdersDto.getCode(),dragonOrdersDto.getStatus(),bankTrxNo);
+    }
 
     /**
      * 支付失败方法

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/impl/ApplepayImpl.java

+package com.liquidnet.service.dragon.channel.strategy.impl;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.biz.DragonServiceCommonBiz;
+import com.liquidnet.service.dragon.channel.alipay.biz.AlipayBiz;
+import com.liquidnet.service.dragon.channel.alipay.strategy.AlipayStrategyContext;
+import com.liquidnet.service.dragon.channel.strategy.annotation.StrategyPayChannelHandler;
+import com.liquidnet.service.dragon.channel.strategy.biz.DragonPayBiz;
+import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.dto.DragonOrdersDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
+import com.liquidnet.service.dragon.service.impl.DragonOrderRefundsServiceImpl;
+import com.liquidnet.service.dragon.utils.DataUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: PayChannelStrategyAlipayImpl
+ * @Package com.liquidnet.service.dragon.channel.strategy.impl
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/13 13:06
+ */
+@Slf4j
+@Component
+@StrategyPayChannelHandler(DragonConstant.PayChannelEnum.ALIPAY)
+public class ApplepayImpl extends AbstractPayChannelStrategyImpl {
+    @Autowired
+    private AlipayStrategyContext alipayStrategyContext;
+
+    @Autowired
+    private DataUtils dataUtils;
+
+    @Autowired
+    private AlipayBiz alipayBiz;
+
+    @Autowired
+    private DragonPayBiz dragonPayBiz;
+
+    @Autowired
+    private DragonServiceCommonBiz dragonServiceCommonBiz;
+
+    @Autowired
+    private DragonOrderRefundsServiceImpl dragonOrderRefundsService;
+
+    @Value("${liquidnet.dragon.alipay.appId}")
+    private String appId;
+    @Value("${liquidnet.dragon.alipay.merchantPubKey}")
+    private String merchantPubKey;
+    @Value("${liquidnet.dragon.alipay.merchantPrivateKey}")
+    private String merchantPrivateKey;
+    @Value("${liquidnet.dragon.alipay.signtType}")
+    private String signtType;
+    @Value("${liquidnet.dragon.alipay.charset}")
+    private String charset;
+
+
+    public void completeSuccessOrder(DragonOrdersDto dragonOrdersDto,String code,String result){
+        this.completeSuccessOrderNoNotify(dragonOrdersDto, code, LocalDateTime.now(), result);
+    }
+
+    @Override
+    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
+        return null;
+    }
+
+    @Override
+    public String dragonNotify(HttpServletRequest request, String payType, String deviceFrom) {
+        return null;
+    }
+
+    @Override
+    public DragonPayOrderQueryRespDto checkOrderStatus(String code) {
+        return null;
+    }
+}

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

@@ -4,6 +4,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import com.liquidnet.service.dragon.service.IDragonOrdersService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -52,7 +53,7 @@ public class PayNotifyController {
     @ApiResponse(code = 200, message = "接口返回对象参数")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payType", value = "支付类型:alipay,wepay,unionpay,applepay", example = "unionpay"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "deviceFrom", value = "设备来源:web,wap,app,js,apple,micropay,innerPurchase", example = "wap"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "deviceFrom", value = "设备来源:web,wap,app,js,apple,micropay,inner", example = "wap"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "业务类型:TICKET,PRODUCT,COST,MBEANS,LIVE,VIDEO,VIP,CLUB,STRAWBERRY", example = "TICKET"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "price", value = "支付金额", example = "0.1"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "name", value = "订单名称", example = "测试订单001"),
@@ -65,7 +66,7 @@ public class PayNotifyController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "expireTime", value = "订单过期时间", example = "1000"),
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "authCode", value = "付款码", example = "1000"),
     })
-    public ResponseDto dragonNotifyApple(
+    public ResponseDto<DragonPayBaseRespDto> dragonNotifyApple(
             @RequestParam(value = "payType") @NotNull(message = "支付类型不能为空") String payType,
             @RequestParam(value = "deviceFrom") @NotNull(message = "设备来源不能为空") String deviceFrom,
             @RequestParam(value = "openId", required = false) String openId,
@@ -109,9 +110,7 @@ public class PayNotifyController {
         dragonPayBaseReqDto.setReceiptData(receiptData);
         dragonPayBaseReqDto.setTransactionId(transactionId);
         //调用苹果
-        dragonOrdersService.dragonNotifyApple(dragonPayBaseReqDto);
-
-        return ResponseDto.success(null);
+        return ResponseDto.success( dragonOrdersService.dragonNotifyApple(dragonPayBaseReqDto));
     }
 
 }

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

@@ -9,6 +9,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.dragon.biz.DragonServiceCommonBiz;
 import com.liquidnet.service.dragon.channel.strategy.PayChannelStrategyContext;
 import com.liquidnet.service.dragon.channel.strategy.biz.DragonPayBiz;
+import com.liquidnet.service.dragon.channel.strategy.impl.ApplepayImpl;
 import com.liquidnet.service.dragon.constant.DragonConstant;
 import com.liquidnet.service.dragon.constant.DragonErrorCodeEnum;
 import com.liquidnet.service.dragon.dto.*;
@@ -49,6 +50,8 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
     private DragonPayBiz dragonPayBiz;
     @Autowired
     private DragonServiceCommonBiz dragonServiceCommonBiz;
+    @Autowired
+    private ApplepayImpl applepay;
 
     @Override
     public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
@@ -94,13 +97,13 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
      * @param dragonPayBaseReqDto
      */
     @Override
-    public void dragonNotifyApple(DragonPayBaseReqDto dragonPayBaseReqDto) {
+    public DragonPayBaseRespDto dragonNotifyApple(DragonPayBaseReqDto dragonPayBaseReqDto) {
         //1 调用苹果查询结果
         String verifyResult = buyAppVerify(dragonPayBaseReqDto.getReceiptData());
         if (verifyResult == null) {
             // 苹果服务器没有返回验证结果
             log.info("苹果支付，app调用，查不到订单信息");
-            return;
+            return null;
         } else {
             JSONObject job = JSONObject.parseObject(verifyResult);
             String states = job.getString("status");
@@ -109,24 +112,31 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
                 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();
+             /*   ApplePayRefundDto applePayRefundDto=ApplePayRefundDto.getNew();*/
                 String product_id = in_appJson.getString("product_id");
-                applePayRefundDto.setProductId(product_id);
+                /*applePayRefundDto.setProductId(product_id);*/
                 String transaction_id = in_appJson.getString("transaction_id");   // 订单号
                 //如果单号一致  则开始处理逻辑
                 if(dragonPayBaseReqDto.getTransactionId().equals(transaction_id)){
-                    /*String[] moneys = product_id.split("\\.");//实际支付金额
-                    //此处开始业务逻辑*/
+                    /*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()),dragonPayBaseReqDto.getCode(),verifyResult);
+                    //
+                    DragonPayBaseRespDto respDto = buildCommonRespDto(dragonPayBaseReqDto);
+                    respDto.setProductId(product_id);
+                    return respDto;
                 }
             } else {
-                return;
+                return null;
             }
         }
-        //2 插入支付该支付的东西（预支付的东西）//dragon_orders
-        dragonServiceCommonBiz.buildPayOrders(dragonPayBaseReqDto,null);
-        //第二部
-
-
+        return null;
     }
     public  String buyAppVerify(String receipt) {
         try{
@@ -141,11 +151,26 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
             String returnDate = EntityUtils.toString(response.getEntity(), "UTF-8");
             EntityUtils.consume(entity);
             log.info("苹果支付完成后查询{} ",returnDate);
+            return returnDate;
         }catch (Exception e){
             log.error(e.getMessage());
         }
 
         return null;
     }
+    /**
+     * 构造公共返回参数
+     * @param dragonPayBaseReqDto
+     * @return
+     */
+    protected DragonPayBaseRespDto buildCommonRespDto(DragonPayBaseReqDto dragonPayBaseReqDto){
+        DragonPayBaseRespDto respDto = new DragonPayBaseRespDto();
+        respDto.setPayType(dragonPayBaseReqDto.getPayType());
+        respDto.setCode(dragonPayBaseReqDto.getCode());
+        respDto.setOrderCode(dragonPayBaseReqDto.getOrderCode());
+        DragonPayBaseRespDto.PayData payData = new DragonPayBaseRespDto.PayData();
+        respDto.setPayData(payData);
+        return respDto;
+    }
 
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/resources/sqlmap.properties

@@ -8,7 +8,7 @@ dragon_order_refund_call_back.update=UPDATE `dragon_order_refunds` SET updated_a
 dragon_order_refund_log.insert=INSERT INTO `dragon_order_refund_logs`(`order_refund_id` ,`refund_type` ,`content`,`created_at`,`updated_at`)VALUES(?,?,?,?,?);
 
 
-dragon_orders.insert=insert into dragon_orders(order_id, status, code, type, price, name, detail, order_code, order_code_id, client_ip, notify_url,notify_status, payment_type, payment_id, payment_at, finished_at, created_at, updated_at, deleted_at) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+dragon_orders.insert=insert into dragon_orders(order_id, status, code, type, price, name, detail, order_code, order_code_id, client_ip, notify_url,notify_status, payment_type, payment_id, payment_at, finished_at, created_at, updated_at, deleted_at,receipt_data) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 dragon_order_logs.insert=insert into dragon_order_logs(code, payment_type, content, created_at, updated_at, deleted_at) values(?,?,?,?,?,?)
 dragon_pay_notify.insert=insert into dragon_pay_notify (code, order_code, notify_url, notify_data, created_at, updated_at) values(?,?,?,?,?,?)
 dragon_pay_notify_fail.insert=insert into dragon_pay_notify_fail (code, order_code, notify_url, notify_data, fail_desc, created_at, updated_at) values(?,?,?,?,?,?,?)