wx前端

src/main/java/com/minpay/common/pay/ShouhuoPay.java

@@ -429,7 +429,7 @@ public class ShouhuoPay implements IMINAction{
 		Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmPaymentInfMapper.class).updateByExampleSelective(payMentInf, paymentExp);
 		// 变更待结算账户
 		IAccountService service = Service.lookup(IAccountService.class);
-		for(VmPaymentInf mentDto : payMentList) {
+	/*	for(VmPaymentInf mentDto : payMentList) {
 			// 支付成功 并且不是充值交易
 			if("TRADE_SUCCESS".equals(status) && !"02".equals(orderInf.getProType())) {
 				// 01：基本账户 02：提现账户 03：待结算账户
@@ -437,7 +437,7 @@ public class ShouhuoPay implements IMINAction{
 				service.modfiyBaseAccount(mentDto.getChannel(), mentDto.getRcvcstno(), "01", mentDto.getTrxamout(), "10", mentDto.getFlowno(), "团员下单");
 				service.modfiyAccount(mentDto.getChannel(), mentDto.getRcvcstno(), "03", mentDto.getTrxamout(), "10", mentDto.getFlowno(), "团员下单");
 			}
-		}
+		}*/
 		orderInf.setId(orderno);
 		Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmOrderInfMapper.class).updateByPrimaryKeySelective(orderInf);
 		if("00".equals(orderInf.getState())){

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

@@ -57,6 +57,7 @@ public class OrderDrawAction implements IMINAction{
 	@MINAction(value = EDIT_ORDER_DRAW)
 	public MINActionResult editOrderDraw(VmOrderInf orderInf) throws MINBusinessException{
 		MINActionResult res = new MINActionResult();
+
 		//是抽奖商品
 		if("01".equals(orderInf.getProType())){
 			//通过订单id获取商品设备关联表id
@@ -66,13 +67,17 @@ public class OrderDrawAction implements IMINAction{
 			List<VmOrderDetails> list = Service.lookup(IMINDataBaseService.class)
 												.getMybatisMapper(VmOrderDetailsMapper.class)
 												.selectByExample(detailsExample);
+			String gameId = orderInf.getGameId();
+
+
+
 			if(list.size() != 0){
 				//获取设备商品信息
 				VmProEquRel proEquRel = Service.lookup(IMINDataBaseService.class)
 												.getMybatisMapper(VmProEquRelMapper.class)
 												.selectByPrimaryKey(list.get(0).getProEquRelId());
 				// 游戏类型（GAME_TYEP：00：不参与，10：游戏购 20：幸运购）
-				if("00".equals(proEquRel.getGameType())) {
+				/*if("00".equals(proEquRel.getGameType())) {
 					return res;
 				}else if("20".equals(proEquRel.getGameType())) {//幸运购
 					orderDrawLucky(orderInf,proEquRel);
@@ -80,6 +85,12 @@ public class OrderDrawAction implements IMINAction{
 					orderDrawGame(orderInf,proEquRel);
 				}else if("30".equals(proEquRel.getGameType())){//幸运游戏购
 					twoOrderDrawGame(orderInf,proEquRel);
+				}*/
+
+				if("100001".equals(gameId)) {//幸运购
+					orderDrawLucky(orderInf,proEquRel);
+				}else if("100002".equals(gameId)){//游戏购
+					orderDrawGame(orderInf,proEquRel);
 				}
 				
 				// 获取最终游戏类型
@@ -145,7 +156,7 @@ public class OrderDrawAction implements IMINAction{
 		if(list.size()!=1){
 			throw new MINBusinessException("订单信息错误！");
 		}
-		
+
 		String sallPrice 	= proEquRel.getSallPrice();		//售货价
 		String costPrice 	= proEquRel.getCostPrice();		//成本价
 		String promotionPrice 	= "0";