fix 合并

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassStudentController.java

@@ -172,7 +172,6 @@ public class ClassStudentController extends BaseController {
         return toAjax(iUserUpdateService.updateByEditBo(bo) ? 1 : 0);
     }
 
-
     /**
      * 官方信息推送
      */

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

@@ -209,12 +209,12 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
                 goods.setPayStatus(OrderGoods.PAY_PART);
                 order.setOrderStatus(Order.PAY_PART);  //订单支付状态改为部分支付
             }
-            iWxPayService.joinLockGrade(order.getOrderSn(),goods.getGoodsId(),goods.getOrderGoodsId());
             order.setStatus(1);//订单生效
             order.setUpdateTime(DateUtils.getNowTime());
             iOrderService.updateById(order);
             goods.setUpdateTime(DateUtils.getNowTime());
             iOrderGoodsService.updateById(goods);
+            iWxPayService.joinLockGrade(order.getOrderSn(),goods.getGoodsId(),goods.getOrderGoodsId());
             iWxPayService.updateUserExamGoods(goods,order);
         }
         iOrderBillGoodsService.saveBatch(coll);
@@ -224,7 +224,7 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
         result.put("sheetSn",sheet_no);
         return result;
     }
-  
+
 
     /**
      * 修改订单商品支付状态为完全支付