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

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

@@ -181,7 +181,12 @@ public class TopOrderBankPayServiceImpl extends ServiceImpl<TopOrderBankPayMappe
             if(checkLog.getCheckStatus()!=2&&checkLog.getCheckStatus()!=5){
                 throw new CustomException("非待支付状态");
             }
-
+            TopOrderBankPay orderBankPay = getOne(new LambdaQueryWrapper<TopOrderBankPay>()
+                    .eq(TopOrderBankPay::getType, bo.getType())
+                    .eq(TopOrderBankPay::getOrderSn, bo.getOrderSn()).ne(TopOrderBankPay::getResultStatus, -1).last("limit 1"));
+            if(Validator.isNotEmpty(orderBankPay)){
+                throw new CustomException("已提交支付");
+            }
             TopSysRole sysRole = iTopSysRoleService.getOne(new LambdaQueryWrapper<TopSysRole>()
                     .eq(TopSysRole::getRoleName, "出纳")
                     .eq(TopSysRole::getStatus, 1).last("limit 1"));
@@ -216,6 +221,9 @@ public class TopOrderBankPayServiceImpl extends ServiceImpl<TopOrderBankPayMappe
             BigDecimal money = null;
             money =order.getBrokerage();
             add.setMoney(money);
+            if(add.getPayType()==4){
+                add.setResultStatus(1);
+            }
             //网银支付
             if(add.getPayType()==5){
                 Map<String, String> params = new HashMap<>();
@@ -306,6 +314,12 @@ public class TopOrderBankPayServiceImpl extends ServiceImpl<TopOrderBankPayMappe
             if (!roleIds.contains(sysRole.getRoleId()) && !bo.getLoginName().equals("admin") ) {
                 throw new CustomException("当前账号没有审核权限");
             }
+            TopOrderBankPay orderBankPay = getOne(new LambdaQueryWrapper<TopOrderBankPay>()
+                    .eq(TopOrderBankPay::getType, bo.getType())
+                    .eq(TopOrderBankPay::getDivideLogId, bo.getDivideLogId()).ne(TopOrderBankPay::getResultStatus, -1).last("limit 1"));
+            if(Validator.isNotEmpty(orderBankPay)){
+                throw new CustomException("已提交支付");
+            }
         /*if (!roleIds.contains(checkLog.getRoleId()) && !bo.getLoginName().equals("admin") ) {
             throw new CustomException("当前账号没有审核权限");
         }*/

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideOrderMapper.xml

@@ -346,6 +346,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             AND bcl.order_sn = v.order_sn)>0
         </if>
+        order by v.create_time
     </select>
 
     <select id="getMonthCreditWaitCount" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="Long">