修改回调

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

@@ -73,16 +73,16 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
     }
     //支付回调
     public void notice(String orderNo,String serialNumber){
-        log.error("---支付回调---order_no====="+orderNo+"----开始处理");
+        log.error("---支付回调---trade_no====="+orderNo+"----开始处理");
         Example example =new Example(OrderPay.class);
-        example.createCriteria().andEqualTo("order_no",orderNo).andEqualTo("is_del",0).andEqualTo("status",0);
+        example.createCriteria().andEqualTo("trade_no",orderNo).andEqualTo("is_del",0).andEqualTo("status",0);
         List<OrderPay> list=mapper.selectByExample(example);
         if(list.size()==0){
-            log.error("---支付回调---order_no====="+orderNo+"----订单不存在或已处理");
+            log.error("---支付回调---trade_no====="+orderNo+"----订单不存在或已处理");
              return;
         }
         example.clear();
-        example.createCriteria().andEqualTo("order_no",orderNo);
+        example.createCriteria().andEqualTo("trade_no",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

@@ -7,6 +7,7 @@ import com.xxfc.platform.universal.biz.OrderPayBiz;
 import com.xxfc.platform.universal.entity.OrderPay;
 import com.xxfc.platform.universal.vo.OrderPayVo;
 import com.xxfc.platform.universal.weixin.util.XMLUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.jdom.JDOMException;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
@@ -19,6 +20,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("pay")
+@Slf4j
 public class OrderPayController extends BaseController<OrderPayBiz,OrderPay> {
 
     /**
@@ -54,6 +56,8 @@ public class OrderPayController extends BaseController<OrderPayBiz,OrderPay> {
         outSteam.close();
         inStream.close();
         String result = new String(outSteam.toByteArray(), "utf-8");
+
+        log.info("---支付回调---result====="+result);
         Map<String, String> map = null;
         try {
             map = XMLUtil.doXMLParse(result);
@@ -62,8 +66,10 @@ public class OrderPayController extends BaseController<OrderPayBiz,OrderPay> {
         }
         if ("SUCCESS".equals(map.get("return_code")) && "SUCCESS".equals(map.get("result_code"))) {
             try {
+
                 String orderno = map.get("out_trade_no");
                 String serialNumber = map.get("transaction_id");
+                log.info("---支付回调---orderno====="+orderno+"-----serialNumber====="+serialNumber);
                 baseBiz.notice(orderno, serialNumber);
             } catch (Exception e) {
                 e.printStackTrace();