fix

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -252,27 +252,35 @@ public class CmsOrderController {
         if (orderDon == null || orderDon.getRelationId() != 0) {
             throw BusinessRuntimeException.getInstance("该订单不是实物订单");
         }
-        RealGoodsOrderHandle realGoodsOrderHandle = Optional.ofNullable(realGoodsOrderHandleMapper.selectOne(Wrappers.lambdaQuery(RealGoodsOrderHandle.class).eq(RealGoodsOrderHandle::getOrderId, request.getOrderId()).last("limit 1"))).orElse(new RealGoodsOrderHandle());
-        if (StringUtils.isNotBlank(request.getBeforeServiceName())) {
-            realGoodsOrderHandle.setBeforeServiceName(request.getBeforeServiceName());
-        }
-        if (StringUtils.isNotBlank(request.getAfterServiceName())) {
-            realGoodsOrderHandle.setAfterServiceName(request.getAfterServiceName());
-        }
-        if (realGoodsOrderHandle.getId() == null) {
-            realGoodsOrderHandle.setOrderId(request.getOrderId());
-            realGoodsOrderHandleMapper.insert(realGoodsOrderHandle);
-        }else {
-            if (realGoodsOrderHandle.getBeforeOpNum() > 2) {
-                throw BusinessRuntimeException.getInstance("售前客服已两次修改");
-            }
-            if (realGoodsOrderHandle.getAfterOpNum() > 2) {
-                throw BusinessRuntimeException.getInstance("售后客服已两次修改");
-            }
-            realGoodsOrderHandle.setBeforeOpNum(realGoodsOrderHandle.getBeforeOpNum() + 1);
-            realGoodsOrderHandle.setAfterOpNum(realGoodsOrderHandle.getAfterOpNum() + 1);
-            realGoodsOrderHandleMapper.updateById(realGoodsOrderHandle);
-        }
+	    Boolean isBefore = false;
+	    Boolean isAfter = false;
+	    RealGoodsOrderHandle realGoodsOrderHandle = Optional.ofNullable(realGoodsOrderHandleMapper.selectOne(Wrappers.lambdaQuery(RealGoodsOrderHandle.class).eq(RealGoodsOrderHandle::getOrderId, request.getOrderId()).last("limit 1"))).orElse(new RealGoodsOrderHandle());
+	    if (StringUtils.isNotBlank(request.getBeforeServiceName())) {
+		    realGoodsOrderHandle.setBeforeServiceName(request.getBeforeServiceName());
+		    isBefore = true;
+	    }
+	    if (StringUtils.isNotBlank(request.getAfterServiceName())) {
+		    realGoodsOrderHandle.setAfterServiceName(request.getAfterServiceName());
+		    isAfter = true;
+	    }
+	    if (realGoodsOrderHandle.getId() == null) {
+		    realGoodsOrderHandle.setOrderId(request.getOrderId());
+		    realGoodsOrderHandleMapper.insert(realGoodsOrderHandle);
+	    } else {
+		    if (realGoodsOrderHandle.getBeforeOpNum() > 2) {
+			    throw BusinessRuntimeException.getInstance("售前客服已两次修改");
+		    }
+		    if (realGoodsOrderHandle.getAfterOpNum() > 2) {
+			    throw BusinessRuntimeException.getInstance("售后客服已两次修改");
+		    }
+		    if (isBefore) {
+			    realGoodsOrderHandle.setBeforeOpNum(realGoodsOrderHandle.getBeforeOpNum() + 1);
+		    }
+		    if (isAfter) {
+			    realGoodsOrderHandle.setAfterOpNum(realGoodsOrderHandle.getAfterOpNum() + 1);
+		    }
+		    realGoodsOrderHandleMapper.updateById(realGoodsOrderHandle);
+	    }
         return GatewayResponse.SUCCESS.newBuilder().toResult("操作成功");
     }