|
|
|
@@ -23,6 +23,7 @@ import com.iformall.mapper.WxCouponOrderMapper; |
|
|
|
import com.iformall.mapper.WxGameActionLogMapper; |
|
|
|
import com.iformall.mapper.WxGameMapper; |
|
|
|
import com.iformall.service.*; |
|
|
|
import com.iformall.service.order.entity.WxComposeOrder; |
|
|
|
import com.iformall.utils.Constant; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
@@ -461,11 +462,11 @@ public class WxGameServiceImpl implements WxGameService { |
|
|
|
orderSave.add(ocsd); |
|
|
|
ResultData resultData1 = wxOrderService.composeSaveOrder(EnumComposeOrder.SINGLE,orderSave, userId, EnumPayWay.PAY_WAY_WECHAT, wxGame); |
|
|
|
|
|
|
|
if(resultData1.code == Result.SUCCESS && resultData1.data != null && resultData1.data instanceof WxOrder){ |
|
|
|
WxOrder order = (WxOrder)resultData1.data; |
|
|
|
orderId = order.getId(); |
|
|
|
if(resultData1.code == Result.SUCCESS && resultData1.data != null && resultData1.data instanceof WxComposeOrder){ |
|
|
|
WxComposeOrder order = (WxComposeOrder)resultData1.data; |
|
|
|
orderId = order.getMainOrderId(); |
|
|
|
}else{ |
|
|
|
logger.info("userId:"+userId+",中奖了发卷失败,"+resultData1.toString()); |
|
|
|
logger.info("userId:"+userId+",中奖了发卷失败,"+resultData1.code+"{}"+resultData1.message); |
|
|
|
resultData.data = null; |
|
|
|
} |
|
|
|
}else if(data instanceof JSONObject){ |
|
|
|
|