fixed 后台充值订单问题

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

@@ -202,8 +202,10 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
             orderDto.setOrderMode(OrderModeEnum.ONESELF.getKey());
             orderDto.setAmount(mtBalance.getAmount());
             orderDto.setPayType(PayTypeEnum.CASH.getKey());
-            orderDto.setPayStatus(PayStatusEnum.SUCCESS.getValue());
+            orderDto.setStatus(OrderStatusEnum.COMPLETE.getKey());
+            orderDto.setPayStatus(PayStatusEnum.SUCCESS.getKey());
             orderDto.setOperator(mtBalance.getOperator());
+            orderDto.setUsePoint(0);
             orderService.saveOrder(orderDto);
         }
 

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

@@ -363,12 +363,20 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         mtOrder.setCouponId(orderDto.getCouponId());
         mtOrder.setParam(orderDto.getParam());
         mtOrder.setRemark(orderDto.getRemark());
-        mtOrder.setStatus(OrderStatusEnum.CREATED.getKey());
+        if (orderDto.getStatus() != null) {
+            mtOrder.setStatus(orderDto.getStatus());
+        } else {
+            mtOrder.setStatus(OrderStatusEnum.CREATED.getKey());
+        }
         mtOrder.setType(orderDto.getType());
         mtOrder.setAmount(orderDto.getAmount());
         mtOrder.setPayAmount(orderDto.getPayAmount());
         mtOrder.setDiscount(orderDto.getDiscount());
-        mtOrder.setPayStatus(PayStatusEnum.WAIT.getKey());
+        if (orderDto.getPayStatus() != null) {
+            mtOrder.setPayStatus(orderDto.getPayStatus());
+        } else {
+            mtOrder.setPayStatus(PayStatusEnum.WAIT.getKey());
+        }
         mtOrder.setPlatform(orderDto.getPlatform());
         mtOrder.setPointAmount(orderDto.getPointAmount());
         mtOrder.setUsePoint(orderDto.getUsePoint());
@@ -531,7 +539,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         }
 
         // 扣减积分
-        if (orderDto.getUsePoint() > 0) {
+        if (orderDto.getUsePoint() != null && orderDto.getUsePoint() > 0) {
             try {
                 MtPoint reqPointDto = new MtPoint();
                 reqPointDto.setUserId(orderDto.getUserId());