支付问题修改

src/main/java/com/ygj/yuemum/controller/pay/CreatePayQrCodeController.java

@@ -52,6 +52,9 @@ public class CreatePayQrCodeController {
             }
         }
         BufferedImage bufferedImage =  customerPayService.createPayQrCode(out_trade_no,channel,price,originPrice,title,productName,productId);
+        if (bufferedImage == null) {
+            return "error";
+        }
         //保存一下
 //        ByteArrayOutputStream os = new ByteArrayOutputStream();
 //        ImageIO.write(bufferedImage, "jpg", os);
@@ -63,7 +66,6 @@ public class CreatePayQrCodeController {
         BASE64Encoder encoder = new BASE64Encoder();
         String png_base64 = encoder.encodeBuffer(bytes).trim();//转换成base64串
         png_base64 = png_base64.replaceAll("\n", "").replaceAll("\r", "");
-        System.out.println(png_base64);
         Map<String, Object> tableData = new HashMap<>();
         tableData.put("img",png_base64);
         return png_base64;

src/main/java/com/ygj/yuemum/service/order/YSOrderService.java

@@ -328,13 +328,17 @@ public class YSOrderService {
             } else {
                 //支付尾款时第三次调用CRM接口
                 ysOrder.setOd_balancepay(ysOrder.getOd_order_pay_amount());
-                ysOrder.setOd_order_pay_amount(
-                        ysOrder.getOd_order_amount() -
-                        ysOrder.getOd_mgm_discount() -
-                        ysOrder.getOd_promotion_discount() -
-                        ysOrder.getOd_other_discount() -
-                        ysOrder.getOd_order_pay_amount() -
-                        ysOrder.getOd_earnestpay());
+                if (od_stauts == 3) {
+                    ysOrder.setOd_order_pay_amount((float) 0);
+                } else {
+                    ysOrder.setOd_order_pay_amount(
+                            ysOrder.getOd_order_amount() -
+                                    ysOrder.getOd_mgm_discount() -
+                                    ysOrder.getOd_promotion_discount() -
+                                    ysOrder.getOd_other_discount() -
+                                    ysOrder.getOd_order_pay_amount() -
+                                    ysOrder.getOd_earnestpay());
+                }
                 if (ysOrder.getOd_introducer_phone() != null) { //当有介绍人的时候
                     //回调CRM进行记录
                     HttpPost httpPost = new HttpPost(extracttemplateid);

src/main/java/com/ygj/yuemum/service/pay/CustomerPayService.java

@@ -129,7 +129,6 @@ public class CustomerPayService {
 //            customerPay.setCp_payamount(data2.doubleValue()); ???
             if (data1.compareTo(data2) == 0) {
                 customerPay.setCp_orderstatus(3);
-                customerPay.setCp_payamount(0.0);
             }
             customerPayDao.insertCustomerPay(customerPay);
             //找到支付名称 保存氚云
@@ -173,8 +172,10 @@ public class CustomerPayService {
         } else {
             return null;
         }
+        if (url.equals("")) {
+            return null;
+        }
         //生成二维码
-
         return qrCodeUtils.encodeIO(url, true);
     }
     public CustomerPay checkTrade (String out_trade_no) {