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

@@ -49,7 +49,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
         Integer amount=orderPayVo.getAmount();
         log.error("---下单---order_no====="+order_no+"--支付订单号--trade_no===="+trade_no+"--金额---amount===="+amount);
         //报名费回调路径
-        String jsParam = WXPay.apppay(1+"",orderPayVo.getBody(),"https://"+ SystemConfig.weixinHost+"/api/universal/app/unauth/notify" ,trade_no,orderPayVo.getBuyerIp(),0);
+        String jsParam = WXPay.apppay(1+"",orderPayVo.getBody(),"https://"+ SystemConfig.weixinHost+"/api/universal/pay/app/unauth/notify" ,trade_no,orderPayVo.getBuyerIp(),0);
         log.info("报名费回调路径jsParam:"+jsParam);
         if(!StringUtils.isBlank(jsParam))
         {
@@ -75,34 +75,14 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
     public void notice(String orderNo,String serialNumber){
         log.error("---支付回调---trade_no====="+orderNo+"----开始处理");
         Example example =new Example(OrderPay.class);
-        example.createCriteria().andEqualTo("trade_no", orderNo).andEqualTo(
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                "is_del",0).andEqualTo("status",0);
+        example.createCriteria().andEqualTo("tradeNo", orderNo).andEqualTo("isDel",0).andEqualTo("status",0);
         List<OrderPay> list=mapper.selectByExample(example);
         if(list.size()==0){
             log.error("---支付回调---trade_no====="+orderNo+"----订单不存在或已处理");
              return;
         }
         example.clear();
-        example.createCriteria().andEqualTo("trade_no",orderNo);
+        example.createCriteria().andEqualTo("tradeNo",orderNo);
         OrderPay orderPay=new OrderPay();
         orderPay.setFinishTime(System.currentTimeMillis());
         orderPay.setStatus(1);

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/OrderPayController.java

@@ -42,7 +42,7 @@ public class OrderPayController extends BaseController<OrderPayBiz,OrderPay> {
      * @param response
      * @throws IOException
      */
-    @RequestMapping(value = "/app/unauth/notify", method = RequestMethod.POST) //匹配的是href中的download请求
+    @RequestMapping(value = "/app/unauth/notify") //匹配的是href中的download请求
     @IgnoreUserToken
     public void notice(HttpServletRequest request, HttpServletResponse response) throws IOException {
         PrintWriter out = response.getWriter();