Merge remote-tracking branch 'origin/dev' into dev

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -639,8 +639,6 @@ public class CommonController extends BaseController {
     @PostMapping("/common/free/encryptDes")
     public AjaxResult encryptDes(@RequestBody ClassGradeDecryptQueryBo bo) {
         try{
-            byte[] Keys = new byte[]{0x22, 0x34, 0x76, 0x58, (byte) 0x90, (byte) 0xAB, (byte) 0xAD, (byte) 0xBF};
-            byte[] rgbKey = "0ca175b9c0f726a831d895e26933246".substring(0, 8).getBytes("UTF-8");
             String source = "bh="+bo.getBh()+"&idnum="+bo.getIdnum()+"&datetime=20230627";
             System.out.println(source);
             return AjaxResult.success(ToolsUtils.encryptDesNew(source,bo.getToken().substring(0, 8)));
@@ -655,8 +653,6 @@ public class CommonController extends BaseController {
     @PostMapping("/common/free/dncryptDes")
     public AjaxResult dncryptDes(@RequestBody ClassGradeDecryptQueryBo bo) {
         try{
-            byte[] Keys = new byte[]{0x22, 0x34, 0x76, 0x58, (byte) 0x90, (byte) 0xAB, (byte) 0xAD, (byte) 0xBF};
-            byte[] rgbKey = "01b5d9833987efdff54483cdc9720da6".substring(0, 8).getBytes("UTF-8");
             System.out.println(ToolsUtils.decryptDesNew(bo.getData(), bo.getToken().substring(0, 8)));
             return AjaxResult.success();
         }catch (Exception e){

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/impl/TopOrderBankPayServiceImpl.java

@@ -152,7 +152,7 @@ public class TopOrderBankPayServiceImpl extends ServiceImpl<TopOrderBankPayMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean payToCompany(TopOrderBankPayAddBo bo) {
-        if(Validator.isEmpty(bo.getType())){
+        if(Validator.isEmpty(bo.getType())||Validator.isEmpty(bo.getPayType())){
             throw new CustomException("类型参数错误");
         }
         if(bo.getType()==4){