fixed 支付报订单号重复问题

fuint-application/src/main/java/com/fuint/common/service/OrderService.java

@@ -120,7 +120,7 @@ public interface OrderService extends IService<MtOrder> {
     /**
      * 更新订单
      *
-     * @param mtOrder
+     * @param  mtOrder
      * @throws BusinessCheckException
      * @return
      * */

fuint-application/src/main/java/com/fuint/common/service/impl/PaymentServiceImpl.java

@@ -161,7 +161,7 @@ public class PaymentServiceImpl implements PaymentService {
     }
 
     /**
-     * 订单支付
+     * 发起支付
      *
      * @param request 请求参数
      * @return
@@ -192,6 +192,11 @@ public class PaymentServiceImpl implements PaymentService {
             mtUser = memberService.queryMemberById(loginInfo.getId());
         }
 
+        // 重新生成订单号
+        String orderSn = CommonUtil.createOrderSN(orderInfo.getUserId().toString());
+        orderInfo.setOrderSn(orderSn);
+        orderService.updateOrder(orderInfo);
+
         // 收银员操作
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (loginInfo == null && accountInfo != null) {

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java

@@ -295,12 +295,10 @@ public class BackendOrderController extends BaseController {
         String discount = param.get("discount") == null ? "" : param.get("discount").toString();
         String remark = param.get("remark") == null ? "" : param.get("remark").toString();
         String orderMode = param.get("orderMode") == null ? "" : param.get("orderMode").toString();
-
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (accountInfo == null) {
             return getFailureResult(1001, "请先登录");
         }
-
         if (orderId < 0) {
             return getFailureResult(201, "系统出错啦，订单ID不能为空");
         }