1、修改缴费名单excel导出功能

src/main/java/com/chuanghai/smartschool/tuitionpayment/controller/PayController.java

@@ -64,36 +64,26 @@ public class PayController {
         WechatJsApiPayParamVO jsApiPayParam = payService.getCCBJsApiParam(openId, orderNo, secondOrderNo, payment);
         //判断该缴费名单是否正在支付
         Boolean flag = Boolean.FALSE;
+        StudentNameTeleVO studentNameTeleVO = new StudentNameTeleVO();
+
         if (payment.equals("2")) {
+            //判断是否被锁定
             Boolean aBoolean = payableInfoWaterService.queryWaterPay(payOrderService.queryPayInfoByOrderId(orderNo), cardNumber);
             if (aBoolean) {
-                StudentNameTeleVO studentNameTeleVO = wechatController.getUserNameTele(payableInfoWaterService.queryByPayInfoId(payOrderService.queryPayInfoByOrderId(orderNo))).getData();
-                flag = Boolean.TRUE;
-                throw new RRException(BizCodeEnume.ORDER_IS_PAYING, "订单已被" +studentNameTeleVO.getName() +"支付锁定,解除锁定请联系："+studentNameTeleVO.getTelephone());
-            }
-        }else {
-            Boolean bBoolean = payableInfoService.queryInforPay(payOrderService.queryPayInfoByOrderId(orderNo), cardNumber);
-            if (bBoolean) {
-                StudentNameTeleVO studentNameTeleVO = wechatController.getUserNameTele(payableInfoWaterService.queryByPayInfoId(payOrderService.queryPayInfoByOrderId(orderNo))).getData();
+                studentNameTeleVO = wechatController.getUserNameTele(payableInfoWaterService.queryByPayInfoId(payOrderService.queryPayInfoByOrderId(orderNo))).getData();
                 flag = Boolean.TRUE;
-                throw new RRException(BizCodeEnume.ORDER_IS_PAYING, "订单已被" +studentNameTeleVO.getName() +"支付锁定,解除锁定请联系："+studentNameTeleVO.getTelephone());
             }
+
         }
+        if (flag) {
+            throw new RRException(BizCodeEnume.ORDER_IS_PAYING, "订单已被" + studentNameTeleVO.getName() + "支付锁定,解除锁定请联系：" + studentNameTeleVO.getTelephone());
 
-//        if (jsApiPayParam.getErrmsg().contains("支付不成功")) {
-//
-//            //订单支付失败则将缴费名单的订单支付中的状态修改为未支付状态
-//            Boolean aaBoolean = payableInfoService.updatePayInfoStatu(payOrderService.queryPayInfoByOrderId(orderNo), "1", "null", "null");
-//            if (!aaBoolean) {
-//                Boolean aBoolean1 = payableInfoWaterService.updateWaterInfoStatu(payOrderService.queryPayInfoByOrderId(orderNo), "1", "null", "null");
-//            }
-//
-//        }
-//        PayableInfoWaterEntity byId = payableInfoWaterService.getById(payOrderService.queryPayInfoByOrderId(orderNo));
-//        System.out.println(byId);
-        if (flag){
-            return CommonResult.fail();
-        }else {
+        }
+
+
+        if (flag) {
+            return CommonResult.fail("10034", "订单已支付锁定");
+        } else {
             return CommonResult.ok().setResult(jsApiPayParam);
         }
     }

src/main/java/com/chuanghai/smartschool/tuitionpayment/controller/PayableInfoWaterController.java

@@ -122,6 +122,7 @@ public class PayableInfoWaterController {
         payableInfoWaterList.forEach(payableInfoWaterEntity -> {
             if (payableInfoWaterEntity.getPayItemType().equals("2")) {
                 PayOrderEntity payOrderEntity = payOrderService.queryOrder(payableInfoWaterEntity.getId());
+
                 payableInfoWaterEntity.setPayerName(payOrderEntity.getPayerName());
                 payableInfoWaterEntity.setOrderNo(payOrderEntity.getOrderNo());
                 payableInfoWaterEntity.setPayerCardNumber(payOrderEntity.getPayerCardNumber());

src/main/java/com/chuanghai/smartschool/tuitionpayment/conver/aliexcel/PayStatuConverter.java

@@ -36,7 +36,7 @@ public class PayStatuConverter implements Converter<String> {
         } else if ("2".equals(value)) {
             payMethod =  "已支付";
         } else {
-            payMethod =  "部分支付";
+            payMethod =  "未支付";
         }
         return new CellData<>(payMethod);
     }

src/main/java/com/chuanghai/smartschool/tuitionpayment/service/impl/PayableInfoWaterServiceImpl.java

@@ -239,7 +239,12 @@ public class PayableInfoWaterServiceImpl extends ServiceImpl<PayableInfoWaterDao
                     .like("college_name", queryTO.getKeyword()));
         }
         if (StringUtils.hasText(queryTO.getPayStatus())) {
-            wrapper.eq("pay_item_type", queryTO.getPayStatus());
+            if (queryTO.getPayStatus().equals("2")) {
+                wrapper.eq("pay_item_type", "2");
+            }else {
+                wrapper.in("pay_item_type", "1","0");
+
+            }
         }
         if (downIDs.size() > 0) {
             wrapper.in("id", downIDs);

src/main/java/com/chuanghai/smartschool/tuitionpayment/utils/RSAUtils.java

@@ -165,7 +165,7 @@ public class RSAUtils {
 //            System.out.println("公钥 =>" + publicKey + "\n");
 
             // RSA加密
-            String data = "29栋副1层2号";
+            String data = "3栋118";
             String encryptData = encrypt(data, getPublicKey(publicKey));
 //            String encryptData = "ugiYZKQ8lmjOLPlVhctIH8sgVvmoFun1Lxc8+Xzm49QDgUh1vhGSYf2uOS/1bCjX/5Ve7sU1S4exl25Ujyh3S7v+lpDqXCsTwhCgpldZOIr0f/BMRdnYdnHUp9beFZKlrDknOKnzF61wFK6096A/md/0vdIwHrCszo8F4Sj1hXs=";
             System.out.println("加密后内容 => " + encryptData + "\n");