金牛：fix NPE

fs-admin/src/main/java/com/fs/his/controller/FsIntegralOrderController.java

@@ -67,6 +67,8 @@ public class FsIntegralOrderController extends BaseController
     private IFsDfAccountService fsDfAccountService;
     @Autowired
     private FsIntegralOrderMapper integralOrderMapper;
+    @Autowired
+    private FsIntegralOrderMapper fsIntegralOrderMapper;
 
     /**
      * 查询积分商品订单列表
@@ -301,7 +303,8 @@ public class FsIntegralOrderController extends BaseController
             //更新一下积分订单的loginaccount这个字段
             order.setOrderId(item.getOrderId());
             order.setLoginAccount(df.getLoginAccount());
-            fsIntegralOrderService.updateFsIntegralOrder(order);
+//            fsIntegralOrderService.updateFsIntegralOrder(order);
+            fsIntegralOrderMapper.updateById(order);
             FsIntegralOrderDf temp = integralOrderDfService.getOne(Wrappers.<FsIntegralOrderDf>lambdaQuery().eq(FsIntegralOrderDf::getOrderId,item.getOrderId()));
             df.setParcelQuantity(param.getParcelQuantity());
 //            df.setErpPhone(param.getErpPhone().trim());

fs-service/src/main/java/com/fs/his/service/impl/FsIntegralOrderServiceImpl.java

@@ -210,10 +210,10 @@ public class FsIntegralOrderServiceImpl implements IFsIntegralOrderService
         FsIntegralOrder order = fsIntegralOrderMapper.selectById(fsIntegralOrder.getOrderId());
         //当前状态
         Integer status = order.getStatus();
-        if (fsIntegralOrder.getStatus().equals(2)){
+        if (status.equals(2)){
             throw new CustomException("积分订单无法修改为待支付状态");
         }
-        if (fsIntegralOrder.getStatus().equals(2)&&StrUtil.isBlank(fsIntegralOrder.getDeliverySn())) {
+        if (status.equals(2)&&StrUtil.isBlank(fsIntegralOrder.getDeliverySn())) {
             throw new CustomException("修改为待发货时，请填写物流单号");
         }
         //其他逻辑，目前暂定这个