Browse Source

Merge branch 'prod' into test

anderx 3 years ago
parent
commit
64bb1bf28e

+ 5 - 4
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -344,7 +344,7 @@
 		left join district_glossory dg2 on b.location_city = dg2.id
 		left join district_glossory dg3 on b.location_area = dg3.id
 		left join admin d on a.aid = d.id
-		where a.type = 1 and a.status =0
+		where a.type = 1 and a.status =0 and a.source in (1,2,3)
 	<if test="role == 0">
 		and un.name
 		<if test="names == null">
@@ -397,7 +397,7 @@
 		from admin
 		where department_id=#{departmentId,jdbcType=VARCHAR}) d on a.aid = d.id
 		</if>
-		where a.type = 1 and a.status =0
+		where a.type = 1 and a.status =0 and a.source in (1,2,3)
 		<if test="role == 0">
 			and un.name
 			<if test="names == null">
@@ -2192,13 +2192,14 @@ inner join(
   </select>
 
   <select id="getUserByNameList" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerSimpleBo">
-  	select id,nickname name from `user` where nickname like concat('%',#{name},'%')
+  	select id,nickname name from `user` where type = 1 and status =0 and source in (1,2,3)
+	and nickname like concat('%',#{name},'%')
   	<if test="page_sql != null">
    		${page_sql}
 	</if>
     </select>
     <select id="getUserByNameCount" resultType="java.lang.Integer" >
-  	select count(*) from `user` where nickname like concat('%',#{name},'%')
+  	select count(*) from `user` where type = 1 and status =0 and source in (1,2,3) and  nickname like concat('%',#{name},'%')
     </select>
     <select id="getAllUser" resultType="com.goafanti.common.bo.OutUser">
 		select id,name ,province ,name_mobile nameMobile from user_now

+ 8 - 0
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -21,6 +21,8 @@ import com.goafanti.order.bo.InputTChangeTask;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.service.OrderChangeService;
 
+import java.io.BufferedReader;
+
 @RestController
 @RequestMapping(value = "/api/admin/orderChange")
 public class OrderChangeApiController extends CertifyApiController {
@@ -383,6 +385,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

@@ -688,6 +688,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());