Browse Source

Merge branch 'test02' into dev02

# Conflicts:
#	src/main/java/com/goafanti/order/controller/OrderChangeApiController.java
anderx 3 years ago
parent
commit
8866cc98f3

+ 7 - 2
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -21,8 +21,6 @@ import com.goafanti.order.bo.InputTChangeTask;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.service.OrderChangeService;
 
-import java.util.List;
-
 @RestController
 @RequestMapping(value = "/api/admin/orderChange")
 public class OrderChangeApiController extends CertifyApiController {
@@ -290,6 +288,7 @@ public class OrderChangeApiController extends CertifyApiController {
 	 * @param timeType
 	 * @param startTime
 	 * @param endTime
+	 * @param depId
 	 * @param salesmanName
 	 * @param complete
 	 * @param orderNo
@@ -384,6 +383,12 @@ public class OrderChangeApiController extends CertifyApiController {
 			res.getError().add(buildError("订单编号和类型不能为空", "订单编号和类型不能为空"));
 			return res;
 		}
+		if (orderChangeService.checkChangeId(nb.getId())){
+			StringBuffer str=new StringBuffer("操作异常");
+			str=str.append("[").append(nb.getId()).append("]").append("编号变更已经完成");
+			res.getError().add(buildError(str.toString(), str.toString()));
+			return res;
+		}
 		res.data(orderChangeService.pushCompleteOrderChange(nb));
 		return res;
 	}

+ 2 - 0
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -106,4 +106,6 @@ public interface OrderChangeService {
 
 
 	int pushCompleteRefund(NewOrderChangeBo nb);
+
+    boolean checkChangeId(Integer id);
 }

+ 9 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -682,6 +682,15 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		return 1;
 	}
 
+	@Override
+	public boolean checkChangeId(Integer id) {
+		NewOrderChangeBo nob=newOrderChangeMapper.selectById(id);
+		if (nob.getStatus()==4){
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * 修改订单数据
 	 * @param nb

+ 1 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -81,7 +81,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if (u!=null&&u.getShareType()==2){
 			in.setNewUser(1);
 		}
-		if (u.getAid().equals(TokenManager.getAdminId())){
+		if (u==null||StringUtils.isEmpty(u.getAid())||u.getAid().equals(TokenManager.getAdminId())){
 			in.setMainStatus(1);
 		}
 		AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());