bugfix

src/main/java/com/caimei/modules/order/utils/HeliPayCertConfig.java

@@ -49,13 +49,13 @@ public class HeliPayCertConfig {
         }
 
         try {
-            merchantPrivateKey = HeliPayCertUtils.getPrivateKeyByPfx("C:\\Users\\Administrator\\Desktop\\tmpCerts\\C1806995267_2303010060964109_privateKey.pfx","cm20230327");
+            merchantPrivateKey = HeliPayCertUtils.getPrivateKeyByPfx("/mnt/newdatadrive/keys/C1806995267_2303010060964109_privateKey.pfx","cm20230327");
         } catch (Exception e) {
             throw new RuntimeException("获取SM2证书私钥字符串异常:"+e.getMessage(),e) ;
         }
 
         try {
-            helipayPublicKey = HeliPayCertUtils.getPublicKey("C:\\Users\\Administrator\\Desktop\\tmpCerts\\helipayPublicKey.cer");
+            helipayPublicKey = HeliPayCertUtils.getPublicKey("/mnt/newdatadrive/keys/helipayPublicKey.cer");
         } catch (Exception e) {
             throw new RuntimeException("加载合利宝SM2证书公钥异常异常:"+e.getMessage(),e) ;
         }

src/main/java/com/caimei/modules/order/web/CmDiscernReceiptController.java

@@ -105,13 +105,13 @@ public class CmDiscernReceiptController extends BaseController {
 //        String list=cmDiscernReceiptService.discern(cmDiscernReceipt.getId());
 //        logger.info("+++++++++++++++++"+cmDiscernReceipt.getId());
         Page<CmDiscernReceipt> page = cmDiscernReceiptService.findPage(new Page<CmDiscernReceipt>(request, response), cmDiscernReceipt);
-        page.getList().forEach(p ->{
-            String date=p.getReceiptDate();
-            if(date!=null){
-            if(!date.contains(":")){
-                date+=" 00:00:01";
-            }
-            p.setReceiptDate(date);
+        page.getList().forEach(p -> {
+            String date = p.getReceiptDate();
+            if (date != null) {
+                if (!date.contains(":")) {
+                    date += " 00:00:01";
+                }
+                p.setReceiptDate(date);
             }
         });
         //获取组织列表
@@ -157,10 +157,10 @@ public class CmDiscernReceiptController extends BaseController {
     @RequestMapping(value = "detail")
     public String detail(CmDiscernReceipt cmDiscernReceipt, Model model) {
         ReceiptDetailVo vo = cmDiscernReceiptService.detail(cmDiscernReceipt);
-        CmDiscernReceipt op=cmDiscernReceiptService.orderlist(cmDiscernReceipt);
+        CmDiscernReceipt op = cmDiscernReceiptService.orderlist(cmDiscernReceipt);
         model.addAttribute("vo", vo);
         model.addAttribute("op", op);
-        model.addAttribute("checkMan",cmDiscernReceipt.getCheckMan());
+        model.addAttribute("checkMan", cmDiscernReceipt.getCheckMan());
 
         return "modules/order/cmDiscernReceiptForm";
     }
@@ -274,7 +274,7 @@ public class CmDiscernReceiptController extends BaseController {
                     String[] productNameArr = productNames.split(",");
                     for (int i = 0; i < productNameArr.length; i++) {
                         productNameArr[i] = (i + 1) + "." + productNameArr[i] + "\r\n";
-                        productNames = i==0?productNameArr[i]:productNames + productNameArr[i];
+                        productNames = i == 0 ? productNameArr[i] : productNames + productNameArr[i];
                     }
                     bean.setProductNames(productNames);
                 }
@@ -284,7 +284,7 @@ public class CmDiscernReceiptController extends BaseController {
             List<CmMainReceiptExport> list1 = cmDiscernReceiptService.exportRebate(cmDiscernReceipt);
             for (CmMainReceiptExport export : list1) {
                 export.setPayType(OrderUtil.getPayTypeStr(export.getPayType()));
-                export.setOrderID(export.getOrderID() + ("5".equals(export.getReceiptType())?"(供应商退款订单)":"(返佣订单)"));
+                export.setOrderID(export.getOrderID() + ("5".equals(export.getReceiptType()) ? "(供应商退款订单)" : "(返佣订单)"));
                 list.add(export);
             }
             //非订单款