Browse Source

Merge remote-tracking branch 'origin/dev' into test

anderx 7 years ago
parent
commit
fd50e40ab8

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PermissionMapper.xml

@@ -273,7 +273,7 @@
   </select>
   <select id="selectIdByName" resultType="java.lang.String">
 		select
-		id
+		name
 		from permission
 		where
 		name=#{name,jdbcType=VARCHAR}

+ 43 - 0
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -0,0 +1,43 @@
+package com.goafanti.order.controller;
+
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.order.enums.CommodityType;
+import com.goafanti.order.service.OrderNewService;
+
+@RestController
+@RequestMapping(value = "/api/admin/newOrder")
+public class AdminNewOrderApiController extends CertifyApiController {
+	
+	@Autowired
+	private OrderNewService orderNewService;
+	/**
+	 * 创建订单
+	 * @param uid
+	 * @param orderType
+	 * @return
+	 */
+	@RequestMapping(value = "/createOrder",method = RequestMethod.POST)
+	public Result createOrder(String uid,Integer orderType){
+		Result res = new Result();
+		if(StringUtils.isBlank(uid)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","客户编号"));
+			return res;
+		}
+		
+		if(orderType == null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单类型"));
+			return res;
+		}
+		//orderNewService.createServiceOrder(uid,orderType);
+		return res;
+	}
+}

+ 11 - 0
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -0,0 +1,11 @@
+package com.goafanti.order.service;
+
+
+
+public interface OrderNewService {
+	
+	
+	
+
+	
+}

+ 3 - 2
src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java

@@ -174,7 +174,8 @@ public class NewPermissionApiController extends BaseApiController {
 			
 		}
 		//*********权限编号判断**************
-		record.setSuperId(permissionMapper.selectIdByName(record.getSuperId()));//上级名称	
+		//record.setSuperId(permissionMapper.selectIdByName(record.getSuperId()));
+		String superName=permissionMapper.selectIdByName(record.getSuperId());//上级名称
 		String autNo=permissionMapper.selectAutNoByName(record.getSuperId());
 		int Count=permissionMapper.selectAutNoCount(record.getSuperId());
 		if((Count+1)>99){
@@ -205,7 +206,7 @@ public class NewPermissionApiController extends BaseApiController {
 			}
 			record.setAutNo(aut);
 		}
-		res.setData(permissionService.updateById(record));
+		res.setData(permissionService.updateById(record,superName));
 		return res;
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/permission/service/PermissionService.java

@@ -31,7 +31,7 @@ public interface PermissionService {
 	
 	List<Permission> selectName(String name);
 	
-	int updateById(Permission record);
+	int updateById(Permission record, String superName);
 	
 	Map<String,Object> findPermissionsAll();
 	

+ 2 - 2
src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java

@@ -148,10 +148,10 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 	}
 
 	@Override
-	public int updateById(Permission record) {
+	public int updateById(Permission record,String superName) {
 		Date now=new Date();
 		record.setUpdateTime(now);
-		if(record.getSuperId().equals("平台超级模块")){
+		if(superName.equals("平台超级模块")){
 			record.setHierarchies("1");
 		}else{
 			record.setHierarchies("0");