修改bug

pom.xml

@@ -298,6 +298,12 @@
             <groupId>us.codecraft</groupId>
             <artifactId>webmagic-core</artifactId>
             <version>0.7.3</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>us.codecraft</groupId>

src/main/java/com/diaoyun/zion/chinafrica/client/TokenVerification.java

@@ -46,7 +46,8 @@ public class TokenVerification {
             "&&!execution(* com.diaoyun.zion.chinafrica.controller.GoodsTypeController.*(..))"+
             "&&!execution(* com.diaoyun.zion.chinafrica.controller.VersionController.*(..))"+
             "&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfFeeController.*(..))"+
-            "&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfOrderController.*(..))"
+            "&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfOrderController.*(..))"+
+            "&&!execution(* com.diaoyun.zion.chinafrica.controller.PayPalController.*(..))"
     )
     public void controllerAspect() {
 

src/main/java/com/diaoyun/zion/chinafrica/controller/PayPalController.java

 package com.diaoyun.zion.chinafrica.controller;
 
 import com.diaoyun.zion.chinafrica.service.PayPalService;
+import com.diaoyun.zion.chinafrica.vo.PayPalResult;
 import com.diaoyun.zion.master.base.Result;
 import com.egzosn.pay.common.api.PayService;
 import com.egzosn.pay.common.bean.MethodType;
@@ -28,23 +29,51 @@ public class PayPalController {
     @Autowired
     private PayPalService payPalService;
 
-    @PostMapping ("/pay")
-    public Result payForOrder(@RequestParam("orderId") String orderId){
+    /**
+     * 发起支付
+     *
+     * @param orderId
+     * @return
+     */
+    @PostMapping("/pay")
+    public Result payForOrder(@RequestParam("orderId") String orderId) {
 
         return payPalService.payForOrder(orderId);
     }
 
+    /**
+     * 支付成功的回调
+     *
+     * @param request
+     * @return
+     */
     @GetMapping("/success")
-    public Result payForSuccess(HttpServletRequest request,@RequestParam("orderId") String orderId){
+    public Result payForSuccess(HttpServletRequest request) {
 
-        return payPalService.payForSuccess(request,orderId);
+        return payPalService.payForSuccess(request);
     }
 
 
+    /**
+     * 取消支付
+     *
+     * @return
+     */
     @GetMapping("/cancel")
-    public Result cancelPay(){
+    public Result cancelPay() {
 
         return new Result().setMessage("订单支付已取消");
     }
 
+    /**
+     * 退款
+     * @param orderId
+     * @param payId
+     * @return
+     */
+    @GetMapping("/refund")
+    public Result refund(@RequestParam("payId") String payId,@RequestParam("orderId") String orderId) {
+        return payPalService.refund(payId, orderId);
+    }
+
 }

src/main/java/com/diaoyun/zion/chinafrica/service/PayPalService.java

 package com.diaoyun.zion.chinafrica.service;
 
+
 import com.diaoyun.zion.master.base.Result;
-import org.springframework.web.bind.annotation.RequestParam;
+
 
 import javax.servlet.http.HttpServletRequest;
 
 public interface PayPalService {
-    public Result payForOrder( String orderId);
-    public Result payForSuccess(HttpServletRequest request,String orderId);
+    public Result payForOrder(String orderId);
+    public Result payForSuccess(HttpServletRequest request);
+    Result refund(String payId, String orderId);
 }

src/main/java/com/diaoyun/zion/chinafrica/service/impl/PayPalServiceImpl.java

 package com.diaoyun.zion.chinafrica.service.impl;
 
 import com.diaoyun.zion.chinafrica.constant.KeyConstant;
+import com.diaoyun.zion.chinafrica.dao.TbCfFinanceDao;
+import com.diaoyun.zion.chinafrica.dao.TbCfIssueCouponDao;
 import com.diaoyun.zion.chinafrica.dao.TbCfOrderDao;
+import com.diaoyun.zion.chinafrica.entity.TbCfFinanceEntity;
 import com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity;
 import com.diaoyun.zion.chinafrica.enums.DeliveryStatusEnum;
 import com.diaoyun.zion.chinafrica.enums.OrderStatusEnum;
 import com.diaoyun.zion.chinafrica.service.PayPalService;
+import com.diaoyun.zion.chinafrica.vo.PayPalResult;
+import com.diaoyun.zion.chinafrica.vo.TbCfFinanceVo;
 import com.diaoyun.zion.chinafrica.vo.TbCfOrderVo;
 import com.diaoyun.zion.master.base.Result;
 import com.diaoyun.zion.master.common.RedisCache;
 import com.diaoyun.zion.master.config.DomainProperties;
 import com.diaoyun.zion.master.enums.ResultCodeEnum;
+import com.diaoyun.zion.master.util.IdUtil;
+import com.diaoyun.zion.master.util.JsoupUtil;
 import com.egzosn.pay.common.api.PayService;
 import com.egzosn.pay.common.bean.MethodType;
 import com.egzosn.pay.common.bean.PayOrder;
+import com.egzosn.pay.common.bean.RefundOrder;
 import com.egzosn.pay.common.http.HttpConfigStorage;
 import com.egzosn.pay.paypal.api.PayPalConfigStorage;
 import com.egzosn.pay.paypal.api.PayPalPayService;
 import com.egzosn.pay.paypal.bean.PayPalTransactionType;
+import com.stripe.model.Charge;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,7 +44,10 @@ import java.util.Map;
 import java.util.UUID;
 
 @Service("payPalService")
+@Transactional
 public class PayPalServiceImpl implements PayPalService {
+    @Autowired
+    private TbCfFinanceDao tbCfFinanceDao;
     @Autowired
     private DomainProperties domainProperties;
     @Resource
@@ -42,16 +55,20 @@ public class PayPalServiceImpl implements PayPalService {
     private static Logger logger = LoggerFactory.getLogger(TbCfOrderServiceImpl.class);
     @Autowired
     private TbCfOrderDao tbCfOrderDao;
+    @Autowired
+    private TbCfIssueCouponDao tbCfIssueCouponDao;
+
+    private String ORDER_ID = "";
 
     @Override
-    @Transactional
     public Result payForOrder(String orderId) {
-        Result result = new Result();
+        ORDER_ID = orderId;
         PayPalConfigStorage storage = new PayPalConfigStorage();
+        Result result = new Result();
         storage.setClientID(domainProperties.getProperty("paypal.client.app"));
         storage.setClientSecret(domainProperties.getProperty("paypal.client.secret"));
-        //storage.setTest(true);
         //发起付款后的页面转跳地址
+        storage.setTest(true);
         storage.setReturnUrl(domainProperties.getProperty("paypal.success.url"));
         //取消按钮转跳地址,这里用异步通知地址的兼容的做法
         storage.setNotifyUrl(domainProperties.getProperty("paypal.cancel.url"));
@@ -62,10 +79,17 @@ public class PayPalServiceImpl implements PayPalService {
         try {
             if (tbCfOrderVo != null) {
                 BigDecimal realityPay = tbCfOrderVo.getRealityPay();
-                PayOrder order = new PayOrder("Order_payment:", "Order payment", realityPay, UUID.randomUUID().toString().replace("-", ""), PayPalTransactionType.sale);
+                PayOrder order = new PayOrder("Order_payment:", "tbCfOrderVo.getUserName()+\"'s order,the total price is $\"+tbCfOrderVo.getRealityPay()", realityPay, UUID.randomUUID().toString().replace("-", ""), PayPalTransactionType.sale);
                 Map orderInfo = service.orderInfo(order);
-                String request = service.buildRequest(orderInfo, MethodType.POST);
-                result.setData(request);
+                Map<String, String> orderHref = JsoupUtil.getOrderHref(orderInfo.toString());
+                System.out.println(orderHref.get("approval_url"));
+                String url = orderHref.get("approval_url");
+                PayPalResult palResult = new PayPalResult();
+                palResult.setOrderId(orderId);
+                palResult.setPayId((String) orderInfo.get("id"));
+                palResult.setPaypalUrl(url);
+                palResult.setOrderDesc(tbCfOrderVo.getUserName() + "'s order,the total price is $" + tbCfOrderVo.getRealityPay());
+                result.setData(palResult);
             } else {
                 result.setCode(ResultCodeEnum.SERVICE_ERROR.getCode()).setMessage("订单不存在！");
             }
@@ -78,37 +102,90 @@ public class PayPalServiceImpl implements PayPalService {
     }
 
     @Override
-    public Result payForSuccess(HttpServletRequest request, String orderId) {
+    public Result payForSuccess(HttpServletRequest request) {
         Result result = new Result();
         PayPalConfigStorage storage = new PayPalConfigStorage();
         storage.setClientID(domainProperties.getProperty("paypal.client.app"));
         storage.setClientSecret(domainProperties.getProperty("paypal.client.secret"));
-        //storage.setTest(true);
-        //发起付款后的页面转跳地址
-        storage.setReturnUrl(domainProperties.getProperty("paypal.success.url"));
-        //取消按钮转跳地址,这里用异步通知地址的兼容的做法
-        storage.setNotifyUrl(domainProperties.getProperty("paypal.cancel.url"));
-        HttpConfigStorage httpConfigStorage = new HttpConfigStorage();
-
+        storage.setTest(true);
         PayService service = new PayPalPayService(storage);
         Map<String, Object> params = null;
-        TbCfOrderVo tbCfOrderVo = (TbCfOrderVo) orderRedisCache.get(KeyConstant.ORDER_DET + orderId);
+
         try {
             params = service.getParameter2Map(request.getParameterMap(), request.getInputStream());
+            String payerID = (String) params.get("PayerID");
+            String paymentId = (String) params.get("paymentId");
+            String token = (String) params.get("token");
             if (service.verify(params)) {
                 System.out.println("支付成功");
-                result.setData("支付成功");
-                removeRedisCache(tbCfOrderVo);
+                result.setMessage("支付成功");
+            } else {
+                result.setMessage("支付失败");
+            }
+            if (ORDER_ID != null) {
+                TbCfOrderVo tbCfOrderVo = (TbCfOrderVo) orderRedisCache.get(KeyConstant.ORDER_DET + ORDER_ID);
+                if (tbCfOrderVo != null) {
+                    //修改订单状态
+                    changeOrderState(paymentId, tbCfOrderVo);
+                    //修改优惠券状态
+                    if (tbCfOrderVo.getCouponId() != null && tbCfOrderVo.getOrderStatus() == 20) {
+                        tbCfIssueCouponDao.changeCoupnStatus(tbCfOrderVo.getUserId(), tbCfOrderVo.getCouponId());
+                    }
+                    //生成支付流水
+                    TbCfFinanceEntity finance = createFinance(paymentId, token, payerID, tbCfOrderVo);
+                    TbCfFinanceVo tbCfFinanceVo = new TbCfFinanceVo();
+                    BeanUtils.copyProperties(finance, tbCfFinanceVo);
+                    //清除订单
+                    removeRedisCache(tbCfOrderVo);
+                }
             }
+
         } catch (IOException e) {
             result.setCode(ResultCodeEnum.SERVICE_ERROR.getCode()).setMessage(e.getMessage());
             logger.error(e.getMessage(), e);
             return result;
         }
+        return result;
 
+    }
+
+    /**
+     * 退款
+     *
+     * @param orderId
+     * @param payId
+     * @return
+     */
+    @Override
+    public Result refund(String payId, String orderId) {
+        Result result = new Result();
+        PayPalConfigStorage storage = new PayPalConfigStorage();
+        storage.setClientID(domainProperties.getProperty("paypal.client.app"));
+        storage.setClientSecret(domainProperties.getProperty("paypal.client.secret"));
+        storage.setTest(true);
+
+        try {
+            PayService service = new PayPalPayService(storage);
+            TbCfOrderEntity tbCfOrderEntity = tbCfOrderDao.queryObject(orderId);
+            RefundOrder order = new RefundOrder();
+            order.setDescription("退款");
+            order.setTradeNo(payId);
+            order.setRefundAmount(tbCfOrderEntity.getTotalPrice());
+            Map resultMap = service.refund(order);
+            result.setData(resultMap).setCode(1).setMessage("退款成功");
+        } catch (Exception e) {
+            result.setCode(ResultCodeEnum.SERVICE_ERROR.getCode()).setMessage(e.getMessage());
+            logger.error(e.getMessage(), e);
+            return result;
+        }
         return result;
     }
 
+    /**
+     * 清空订单缓存
+     *
+     * @param tbCfOrderVo
+     */
     private void removeRedisCache(TbCfOrderVo tbCfOrderVo) {
         orderRedisCache.delete(KeyConstant.ORDER_DET + tbCfOrderVo.getOrderId());
         String couponId = "";
@@ -119,6 +196,12 @@ public class PayPalServiceImpl implements PayPalService {
         orderRedisCache.delete(KeyConstant.ORDER_EXP + orderIdAndCouponId);
     }
 
+    /**
+     * 修改订单状态
+     *
+     * @param payId
+     * @param oldOrder
+     */
     private void changeOrderState(String payId, TbCfOrderVo oldOrder) {
         //更改订单状态
         TbCfOrderEntity tbCfOrder = new TbCfOrderEntity();
@@ -131,4 +214,26 @@ public class PayPalServiceImpl implements PayPalService {
         tbCfOrder.setPayStatus(OrderStatusEnum.PAID.getValue());
         tbCfOrderDao.update(tbCfOrder);
     }
+
+    /**
+     * 记录财务流水
+     *
+     * @param
+     * @param tbCfOrderVo
+     */
+    private TbCfFinanceEntity createFinance(String paymentId, String token, String payerId, TbCfOrderVo tbCfOrderVo) {
+        TbCfFinanceEntity tbCfFinance = new TbCfFinanceEntity();
+        String successUrl = domainProperties.getProperty("paypal.success.url");
+        String receiptUrl = successUrl + "?paymentId=" + paymentId + "&token=" + token + "&PayerID=" + payerId;
+        tbCfFinance.setOrderId(tbCfOrderVo.getOrderId());
+        tbCfFinance.setFinaceId(IdUtil.createIdbyUUID());
+        tbCfFinance.setPayAccount(tbCfOrderVo.getRealityPay());
+        tbCfFinance.setPayId(paymentId);
+        tbCfFinance.setPayTime(new Date());
+        tbCfFinance.setReceiptUrl(receiptUrl);
+        tbCfFinance.setPayWayCode("paypal");
+        tbCfFinance.setUserId(tbCfOrderVo.getUserId());
+        tbCfFinanceDao.save(tbCfFinance);
+        return tbCfFinance;
+    }
 }

src/main/java/com/diaoyun/zion/chinafrica/vo/PayPalResult.java

+package com.diaoyun.zion.chinafrica.vo;
+
+/**
+ * 支付返回类
+ */
+public class PayPalResult {
+    //订单id
+    private String orderId;
+    //支付id
+    private String payId;
+    //paypal回调url
+    private String paypalUrl;
+
+    //订单描述
+    private String orderDesc;
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getPayId() {
+        return payId;
+    }
+
+    public void setPayId(String payId) {
+        this.payId = payId;
+    }
+
+    public String getPaypalUrl() {
+        return paypalUrl;
+    }
+
+    public void setPaypalUrl(String paypalUrl) {
+        this.paypalUrl = paypalUrl;
+    }
+
+    public String getOrderDesc() {
+        return orderDesc;
+    }
+
+    public void setOrderDesc(String orderDesc) {
+        this.orderDesc = orderDesc;
+    }
+}

src/main/resources/properties/domain.properties

@@ -34,10 +34,14 @@ tencent.translate.app_url=https://api.ai.qq.com/fcgi-bin/nlp/nlp_texttranslate
 tencent.wordpos.app_url=https://api.ai.qq.com/fcgi-bin/nlp/nlp_wordpos
 
 ################腾讯翻译配置 END###################
-
+##################新11.05(stripe公钥(不加密)和私钥(已用 AESUtils 加密))################################
+stripe.pk=pk_live_FP6ipnw3lt0e1AmS5IVdpJWd00s5PLdbVa
+stripe.sk=YWA9aMOPvCfq0KWda2Wsh567lLl600+QK/X8ZEFDPj6UDNd3icKr6fJ+X3ey8X+T
+#stripe.pk=pk_test_y5dXLjyUyBD11Ta9g2DGynxN0048vnmpGz
+#stripe.sk=+RFm7p84hym4liN1/MSoshYMiy4rWgUFoZ3S5+ucxRTyzblQL2Pi0y1TDQoSE96z
 ##################stripe公钥(不加密)和私钥(已用 AESUtils 加密)################################
-stripe.pk=pk_live_5MdXU4N1cvmU1yatYp5v0E0n00C7tAXpGB
-stripe.sk=d87UqTQ6QUjuNkXrjH51Gl/Zqnfy98HRl23xljism2hpaXjSNTwdl6pv6FM7D4tT
+#stripe.pk=pk_live_5MdXU4N1cvmU1yatYp5v0E0n00C7tAXpGB
+#stripe.sk=d87UqTQ6QUjuNkXrjH51Gl/Zqnfy98HRl23xljism2hpaXjSNTwdl6pv6FM7D4tT
 #stripe.pk=pk_test_rXUSgU8Kw7DLhDzMbHM0r55O00JAzVBBJR
 #stripe.sk=3ff57yz9S5INBexBOnzi/ZaxClXkXlJ+FZ6XLc/f2vpESScG7YOaQaG2YNRic3HF
 ######################outlook的账户公钥密钥#####################
@@ -54,7 +58,13 @@ express.info.token=d44426bd5b64dd2
 #paypal.client.app=AW7u5JVLhzA7_0EznoZ7uKHFzz1_nACOtt6k9oEpbisGUy3nqjjb3L-MmBFnD3YDuMSapcXpfSiYWtiB
 #paypal.client.secret=EIyDryMDyM0BDWp2mtuGFdSU2WOkWtmSuGGaRnUiIom7kxuM7JhuSFfETbC8X4e9E_ZbMX4zg4jHA1lV
 paypal.mode=live
-paypal.client.app=AWbyqn1AKJeVvzNsYms_9fs_LVr5_w5Xyt8nX5q0Wmqoq0NYCZf2wyz9DDeA5ArsWx0LFBwl5Oz6amD2
-paypal.client.secret=EFhRjCBzhtI1lf88Xiy3VF07gVpu1vWk0VheSP3n5J0fhQxA6Pu7j89dbyYTLj3FxqiJBOlxQRKG_58e
-paypal.success.url=http://127.0.0.1:8083/paypal/success
-paypal.cancel.url=http://127.0.0.1:8083/paypal/cancel
+#################################真实######################################################
+#paypal.client.app=AUUFVT30kPIP-a7dcQfPS8KYdl5cCZIwyYNIS79Cp7E_0GNZWfut3ZHQiRIoamqRstHigMoTTy1n8Glj
+#paypal.client.secret=EJBVz86f9Mg482bL3lniPtLYe_ULyBkjTS0q-qhZBIVFC3dgae-J7-JJA5iWQAZsQqtAOV_ctVGWNLJS
+#################################测试######################################################
\ No newline at end of file
+paypal.client.app=AW7u5JVLhzA7_0EznoZ7uKHFzz1_nACOtt6k9oEpbisGUy3nqjjb3L-MmBFnD3YDuMSapcXpfSiYWtiB
+paypal.client.secret=EIyDryMDyM0BDWp2mtuGFdSU2WOkWtmSuGGaRnUiIom7kxuM7JhuSFfETbC8X4e9E_ZbMX4zg4jHA1lV
+#paypal.success.url=https://africa.gzdazt.com/zion/paypal/success
+#paypal.cancel.url=https://africa.gzdazt.com/zion/paypal/cancel
+paypal.success.url=http://localhost:8083/zion/paypal/success
+paypal.cancel.url=http://localhost:8083/zion/paypal/cancel
\ No newline at end of file