Browse Source

Merge remote-tracking branch 'origin/test'

anderx 8 years ago
parent
commit
0285c02ac5

+ 7 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -278,7 +278,13 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/admin/servicesManage/copyright");
 		return modelview;
 	}
-
+	
+	@RequestMapping(value = "/admin/servicesManage/projectOrder", method = RequestMethod.GET)
+	public ModelAndView adminServiceManageProjectOrder(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/admin/servicesManage/projectOrder");
+		return modelview;
+	}
+	
 	@RequestMapping(value = "/admin/index", method = RequestMethod.GET)
 	public ModelAndView adminHome(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/admin/index");

+ 1 - 1
src/main/java/com/goafanti/common/dao/TOrderMapper.java

@@ -89,5 +89,5 @@ public interface TOrderMapper {
 	 * @param orderId
 	 * @return
 	 */
-	List<TOrderDetail> selectOrderCommodity(@Param("orderId")String orderId);
+	List<TOrderDetail> selectOrderCommodity(@Param("orderNo")String orderNo);
 }

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -686,7 +686,7 @@
   <select id="selectOrderCommodity" parameterType="java.lang.String" resultType="com.goafanti.common.model.TOrderDetail">
 		select
 			id,
-			order_id as orderId,
+			order_no as orderNo,
 			commodity_id as commodityId,
 			commodity_name as commodityName,
 			commodity_quantity as commodityQuantity,
@@ -697,6 +697,6 @@
 		from
 			t_order_detail
 		where
-			order_id = #{orderId,jdbcType=VARCHAR}
+			order_no = #{orderNo,jdbcType=VARCHAR}
   </select>
 </mapper>

+ 3 - 5
src/main/java/com/goafanti/message/service/impl/MessageServiceImpl.java

@@ -183,8 +183,6 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 					}
 				}
 			}
-			if(producerTarget.size()>0) insertBatchProducer(producerTarget);	
-			//推送消息
 		}else if(subject == SubjectType.YUN_YING.getTypeCode()){
 			String tmp = selectSendUser(targetMap,targetType);
 			if(tmp !=null){
@@ -211,10 +209,10 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 					}
 				}
 			}			
-			if(producerTarget.size()>0) insertBatchProducer(producerTarget);
-			//推送消息
-			if(sendTarget.size()>0) jgMessageHelper.sendSystemMessage(sendTarget);
 		}
+		if(producerTarget.size()>0) insertBatchProducer(producerTarget);
+		//推送消息
+		if(sendTarget.size()>0) jgMessageHelper.sendSystemMessage(sendTarget);
 		return 1;
 	}
 	

+ 3 - 1
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -128,6 +128,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
 		
 		TOrderDetail tOrderDetail = new TOrderDetail();
+		tOrderDetail.setId(UUID.randomUUID().toString());
 		tOrderDetail.setOrderNo(orderNo);
 		tOrderDetail.setCommodityId(commodityId);
 		tOrderDetail.setCommodityName(bo.getCommodityName());
@@ -542,11 +543,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		List<TOrder> list = (List<TOrder>)data.getList();
 		C2BOrderDetailBo bo = null;
 		List<C2BOrderDetailBo> boList = new ArrayList<C2BOrderDetailBo>(); 
-		List<CommodityDetailBo> commoditys = new ArrayList<CommodityDetailBo>();
+		List<CommodityDetailBo> commoditys = null;
 		CommodityDetailBo cdb = null;
 		if(list.size()>0){
 			for(TOrder t:list){
 				bo = new C2BOrderDetailBo();
+				commoditys = new ArrayList<CommodityDetailBo>();
 				bo.setOrderNo(String.valueOf(t.getOrderNo()));
 				bo.setOrderRemarks(t.getOrderRemarks());
 				bo.setOrderStatus(OrderState.getStatus(t.getOrderStatus()).getDesc());

+ 1 - 1
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -195,7 +195,7 @@ public class UserRegisterController extends BaseController {
 			resultObj.put("password", easemobPass);
 			resultObj.put("username", easemobName);
 			resultObj.put("nickname", StringUtils.isBlank(u.getNickname()) ? "技淘用户" + u.getNumber() : u.getNickname());
-			easemobUtils.sendLater(
+			easemobUtils.send(
 					new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
 			//绑定账号
 			messageService.addJpushEasemobAccount(uuid,u.getId(),easemobName,easemobPass);		

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -73,6 +73,6 @@ easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
 easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA
 easemob.client.secret=YXA61NHE0renI5N8gEgizoI5ivM9SYE
 
-jiguang.appKey=36944c5628d34ff997f56dcd
-jiguang.masterSecret=cceff6a22d91c06786bfdcd3
+jiguang.appKey=dbcea43366e038073452a04e
+jiguang.masterSecret=59792298288e4f635c737def
 jiguang.pushUrl=https://api.jpush.cn/v3/push

+ 2 - 2
src/main/resources/props/config_test.properties

@@ -73,6 +73,6 @@ easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
 easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA
 easemob.client.secret=YXA61NHE0renI5N8gEgizoI5ivM9SYE
 
-jiguang.appKey=36944c5628d34ff997f56dcd
-jiguang.masterSecret=cceff6a22d91c06786bfdcd3
+jiguang.appKey=dbcea43366e038073452a04e
+jiguang.masterSecret=59792298288e4f635c737def
 jiguang.pushUrl=https://api.jpush.cn/v3/push

+ 16 - 0
src/main/webapp/WEB-INF/views/admin/servicesManage/projectOrder.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>项目单管理</title>
+	<link th:href="${staticHost+'/admin/servicesManage/projectOrder.css'}" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/admin/servicesManage/projectOrder.js'}"></script>
+	</div>
+</body>
+</html>