微信支付

src/main/java/com/huiju/estateagents/controller/WxPayController.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.controller;
 
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.wxpay.WXPayConstants;
 import com.huiju.estateagents.common.wxpay.WXPayUtil;
 import com.huiju.estateagents.entity.TaOrder;
 import com.huiju.estateagents.service.IWxPayService;
@@ -29,7 +30,7 @@ public class WxPayController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/pay/unifiedOrder",method = RequestMethod.POST)
+    @RequestMapping(value = "/wx/unifiedOrder",method = RequestMethod.POST)
     public ResponseBean wxUnifiedOrder(@RequestBody TaOrder taOrder,
                                        HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -47,7 +48,9 @@ public class WxPayController extends BaseController {
 
     @RequestMapping(value = "/notify/{type}",method = RequestMethod.POST)
     public String wxBillNotify(@PathVariable String type, HttpServletRequest request){
-
+        log.info("支付成功回调开始，支付类型是{}",type);
+        String failResult = "<xml>" + "<return_code><![CDATA[FAIL]]></return_code>" + "<return_msg><![CDATA[失败]]></return_msg>" + "</xml> ";
+        String successResult = "<xml>" + "<return_code><![CDATA[SUCCESS]]></return_code>" + "<return_msg><![CDATA[OK]]></return_msg>" + "</xml> ";
         Map<String, String> resultMap = new HashMap<>();
         try {
             InputStream inStream = request.getInputStream();
@@ -67,11 +70,20 @@ public class WxPayController extends BaseController {
             inStream.close();
             // xml转换为map
             resultMap = WXPayUtil.xmlToMap(result);
+            //处理业务需求
+            if (WXPayConstants.SUCCESS.equalsIgnoreCase(resultMap.get("result_code"))) {
+                wxPayService.wxNotify(resultMap, type);
+            }else {
+                log.error("支付回调出错{}",resultMap.get("return_msg"));
+                return failResult;
+            }
+
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("支付回调出错{}",e.getMessage());
+            return failResult;
         }
 
-        return wxPayService.wxNotify(resultMap, type);
+        return successResult;
     }
 
 }

src/main/java/com/huiju/estateagents/entity/TaOrder.java

@@ -80,5 +80,10 @@ public class TaOrder implements Serializable {
      */
     private Integer parentOrderId;
 
+    /**
+     * 微信订单号
+     */
+    private String transactionId;
+
 
 }

src/main/java/com/huiju/estateagents/service/IWxPayService.java

@@ -15,5 +15,5 @@ public interface IWxPayService {
      */
     ResponseBean payUnifiedOrder(TaOrder taOrder, String clientIp) throws Exception;
 
-    String wxNotify(Map<String, String> resultMap, String type);
+    void wxNotify(Map<String, String> resultMap, String type);
 }

src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java

@@ -112,26 +112,40 @@ public class WxPayServiceImpl implements IWxPayService {
         return ResponseBean.success(secondSignData);
     }
 
+    /**
+     * 微信支付成功的回调，处理业务需求
+     * @param resultMap
+     * @param type
+     */
     @Override
-    public String wxNotify(Map<String, String> resultMap, String type) {
-        String failResult = "<xml>" + "<return_code><![CDATA[FAIL]]></return_code>" + "<return_msg><![CDATA[失败]]></return_msg>" + "</xml> ";
-        String successResult = "<xml>" + "<return_code><![CDATA[SUCCESS]]></return_code>" + "<return_msg><![CDATA[OK]]></return_msg>" + "</xml> ";
-        if (WXPayConstants.SUCCESS.equalsIgnoreCase(resultMap.get("result_code"))) {
-            //处理业务逻辑 修改订单状态等
-            resultMap.put("pay_type","0");
-            String state = "";
-            if (type.equals(CommConstant.ORDER_TARGET_TYPE_HOUSE)) {
-                //state = wxPayService.wxCarNotify(resultMap);
-            }
-
-            if (state.equals("success")){
-                log.info("微信支付成功。。");
-                return successResult;
-            }
-        }else{
-            return failResult;
+    public void wxNotify(Map<String, String> resultMap, String type) {
+        //house类型的支付成功的回调,处理业务逻辑 修改订单状态等
+        if (type.equals(CommConstant.ORDER_TARGET_TYPE_HOUSE)) {
+            wxHouseNotify(resultMap);
         }
-        return null;
+
+    }
+
+    /**
+     * 处理认筹房源的相关数据
+     * @param resultMap
+     * @return
+     */
+    private synchronized void wxHouseNotify(Map<String, String> resultMap) {
+        String tradeNo = resultMap.get("out_trade_no");
+        String transactionId = resultMap.get("transaction_id");
+        QueryWrapper<TaOrder> taOrderQueryWrapper = new QueryWrapper<>();
+        taOrderQueryWrapper.eq("trade_no",tradeNo);
+        TaOrder taOrder = taOrderMapper.selectOne(taOrderQueryWrapper);
+        //设置为已缴费
+        taOrder.setPayStatus(CommConstant.PAY_STATUS_PAID);
+        taOrder.setPayTime(LocalDateTime.now());
+        taOrder.setTransactionId(transactionId);
+        taOrderMapper.updateById(taOrder);
+        //修改认筹单支付状态
+        TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taOrder.getTargetId());
+        taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_PAID);
+        taRaiseRecordMapper.updateById(taRaiseRecord);
     }
 
     /**

src/test/java/com/huiju/estateagents/WxPayTest.java

@@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 public class WxPayTest {
 
 //    @Test
-    public void getLocationCity() {
-        System.out.println(System.currentTimeMillis());
-    }
+//    public void getLocationCity() {
+//        System.out.println(System.currentTimeMillis());
+//    }
 }