游戏

src/main/java/com/minpay/shouhuo/orderdrawaction/OrderDrawAction.java

@@ -72,7 +72,34 @@ public class OrderDrawAction implements IMINAction{
 			String gameId = orderInf.getGameRule();
 			IDrawService drawService = new DrawServiceImpl();
 			List<DrawDto> drawDtoList1 = new ArrayList<>();
-			if("0".equals(gameId)) {//幸运购
+			for (int i = 0; i < list.size(); i++) {
+				List<DrawDto> drawDtoList2 = new ArrayList<>();
+				//查询订单详情关联货到
+				VmOrderDetails vmOrderDetails = list.get(i);
+				VmProEquRel vmProEquRel = Service.lookup(IMINDataBaseService.class)
+												.getMybatisMapper(VmProEquRelMapper.class)
+												.selectByPrimaryKey(vmOrderDetails.getProEquRelId());
+				String gameType = vmProEquRel.getGameType();
+				if(gameType.equals("10")){ //游戏购
+					drawDtoList2 = drawService.orderDrawGame( orderInf,  vmProEquRel,  list.get(0));
+
+				}else if(gameType.equals("20")){ //幸运购
+					List<DrawDto> drawDtoList = new ArrayList<>();
+					DrawDto drawDto = new DrawDto();
+					drawDto.setOrderId(vmOrderDetails.getOrderId());
+					drawDto.setOrderDetailsId(vmOrderDetails.getDetailsId());
+					drawDto.setHuodaoNo(vmOrderDetails.getProEquRelId());
+					drawDto.setChouJiangAmt(orderInf.getOrderAmt());
+					drawDtoList.add(drawDto);
+					drawDtoList2 = drawService.xingyunDraw( orderInf.getOrderAmt(),  orderInf.getId(),  sysorderno,
+							orderInf.getEquipmentId(), drawDtoList);
+
+				}
+				drawDtoList1.addAll(drawDtoList2);
+
+			}
+
+			/*if("0".equals(gameId)) {//幸运购
 				//查询当前机构的幸运够
 				List<DrawDto> drawDtoList = new ArrayList<>();
 				for (int i = 0; i < list.size(); i++) {
@@ -95,7 +122,11 @@ public class OrderDrawAction implements IMINAction{
 						.selectByPrimaryKey(list.get(0).getProEquRelId());
 				drawDtoList1 = drawService.orderDrawGame( orderInf,  proEquRel,  list.get(0));
 
-			}
+			}*/
+
+
+
+
 			//更新 订单表， 订单详情表，提货表
 			DeliveryAction.createDeliveryInfo(drawDtoList1);