Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -8,6 +8,7 @@ import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
 import com.xxfc.platform.universal.vo.OrderPayVo;
 import com.xxfc.platform.universal.weixin.api.WXPay;
+import com.xxfc.platform.universal.weixin.util.HTTPUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -17,7 +18,9 @@ import com.xxfc.platform.universal.mapper.OrderPayMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单支付
@@ -87,6 +90,23 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
         orderPay.setFinishTime(System.currentTimeMillis());
         orderPay.setStatus(1);
         orderPay.setSerialNumber(serialNumber);
-        mapper.updateByExampleSelective(orderPay,example);
+        int num=mapper.updateByExampleSelective(orderPay,example);
+        log.error("---支付回调处理---num====="+num+"----orderNo======="+orderNo);
+        if(num>0){
+            OrderPay pay= list.get(0);
+            if(StringUtils.isNotBlank(pay.getNotifyUrl())){
+                String url=pay.getNotifyUrl();
+                url+="&tradeNo="+orderNo;
+                log.error("---支付回调处理---orderNo======="+orderNo+"----notifyUrl===="+url);
+                String result=HTTPUtils.doGet(url);
+                log.error("---支付回调处理---orderNo======="+orderNo+"---result==="+result);
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        String url="http://10.1.37.248:8765/api/order/baseOrder/app/unauth/notifyUrl?orderNo=20190603111125010022&tradeNo=20190603111125000003";
+        String result=HTTPUtils.doGet(url);
+        System.out.println(result);
     }
 }
\ No newline at end of file